Refactoring in the object model