No more spaces in key names for API