Data refactor