The next step to further refactor the epochal data part.