#CHANGE: Renamed a lot of Register/Unregister methods to Add/Remove methods.