replaced raw values with enums.