Adjusted registry to include more identifier types & made it a single array of enums