Change some file construction