refactor dumafajee registry