change name to resoure registry and new data structure