odata metadata refactor