Refactored the bindings to use a binding context