Refactoring of object types