Support single file name as well