Added fallbacks to JSON structure