Upgrade to support new string and hash syntax from support