Switch to key/value pairs for api submission.