Added support for paths with spaces