Changed up sender

Now the JSON structure is enforced and the call sites
look prettier.