Improve constraint bindings