Updated binding and unbinding functionality