Also, since we are trying to use keywords with dashes instead of underscores in most places, would it make sense to massage those before you return the map?