Add support for filepaths with spaces