Refactored binder