refactoring service registry
merge with origin/master