Initial support for registration