Add support for registering in new format