Add support for directories with spaces