Updates to handle multiple bindings better