Add support for registrations