Added file factory