Added base output file handling and data fields