Added EscaTypes to handle the mappings.