Added DataFormat class