added mapping for enums