Put bindings into KM handler

Simplify some code and condense layout.
Bump version