Additional bindings and code clean up