Adds message_id; Minor refactor; Validates payload