OData metadata refactor