Add EntityTypes. Make all other enumeration classes final and private constructors. Add getValues() method to all enumeration classes.