Refactoring data assembly