Update to Kotlin API