Refactored the JSON payload so there's room for future expansion.