Updated to JSON structure