Add mappings for more enums