Object refactoring