Allow for spaces in names