Handling of enumerations within objects is now working