Added registry and changes to routing