Update with kotlin changes