Improvements/uat 216 outputfile ext