2.x client updates

Perhaps rename these as the specific modes are Registration, Interest and RegistrationAndInterest