Adapt to new File format && change output