Adding support for white-spaces in directories / configuration names