Refactored binding library