Added the support of multiple files and directories