Removed enums replaced with Strings