Added support for paths with whitespaces