Changed API from bind to on and unbind to off