Service registration

Merging service registration branch into master.