Added preliminary file output support