Bindings refactoring