Minor changes to register class