Reworked registration

Added source among other changes