Additions to DataFile and fixes for class separation.