Added ways to define enumerations within objects