With addition of new enums, classes use these enum values instead of strings in constructors