Bindings fix and addition