Updated interface to try and use more generic bind/unbind mechanism.