fix for JUM-14 :Refactored File constructors