Move enum to NS_ENUM + handle nil result from mappingType