Improved DataFile class. Removed some mistakes