Added partial support for Registration v2