Better JSON structure for token responses