V4 changes: fixed enums, added support for OData singletons.