Registration

Splitted the previous PR