Added parsing for all data files