Improve file adding so simpler