Adding support for spaces in resource names