Renamed an enum
Started to add mappings