Added support for registration, issue