🎨 Replace DefaultIdentity with Kotlin version