Refactoring data object