Consolidate more data files