Update to use options object and renamed binder