[PERSEPHONE-13] Cleaning up Registry class (work-in-progress)
[PERSEPHONE-13] DONE
[PERSEPHONE-12] IN-PROGRESS