Added registry and map)))