Only send key/value pairs in payload if a value exists
Add some distribution functionality