Refactor Bindings