Add service oriented delegate and routes
Merge in service oriented delegates and routes