Refactored bindings so they don't depend on the CallContext