Bindings refactor