oid refactoring