changed RegistryService to singleton
merged conflicts