Added enums to classes that could use them.