Phase 1, data handling unification