Make DataFormat an enumeration
DataFormat is now built by tpp
Arguments change for loading/saving data files