Renamed Methods to register / unregister, instead of add / remove