Added support for seperate account type registrations