Refactor bindings strategy