Enum-ified the registries