Passing null files through + Added clone option