Make Uniform and Attribute use Enum model