Allow dashes and spaces in dictionary keys