Some clean up.
Changed sample payload to generic key value pairs.