Remove enum conversion to number to use string value by default