Added support for object-oriented enums, model annotations and model base class.