Should this be a JSON object instead?