diff --git a/schemas/country.py b/schemas/country.py
index bb70a9c..3667e92 100644
--- a/schemas/country.py
+++ b/schemas/country.py
@@ -2,42 +2,36 @@ from pydantic import BaseModel, Field
 from typing import Optional
 
 class CountryBase(BaseModel):
-    name: str = Field(..., description="Country name")
-    code: str = Field(..., description="Country code", min_length=2, max_length=3)
-    capital: Optional[str] = Field(None, description="Capital city")
-    region: Optional[str] = Field(None, description="Geographic region")
-    subregion: Optional[str] = Field(None, description="Geographic subregion")
-    population: Optional[str] = Field(None, description="Country population")
-    flag: Optional[str] = Field(None, description="Country flag URL")
+    name: str = Field(..., index=True, min_length=1, description="Country name")
+    iso2: str = Field(..., min_length=2, max_length=2, description="ISO 3166-1 alpha-2 code")
+    iso3: str = Field(..., min_length=3, max_length=3, description="ISO 3166-1 alpha-3 code") 
+    capital: str = Field(..., min_length=1, description="Capital city")
+    region: str = Field(..., min_length=1, description="Geographic region")
+    subregion: str = Field(..., min_length=1, description="Geographic subregion")
+    population: str = Field(..., min_length=1, description="Population count")
+    latitude: str = Field(..., min_length=1, description="Latitude coordinates")
+    longitude: str = Field(..., min_length=1, description="Longitude coordinates")
+    flag: str = Field(..., min_length=1, description="Flag image URL")
 
 class CountryCreate(CountryBase):
     class Config:
         schema_extra = {
             "example": {
                 "name": "United States",
-                "code": "USA",
+                "iso2": "US",
+                "iso3": "USA",
                 "capital": "Washington, D.C.",
                 "region": "Americas",
-                "subregion": "North America",
-                "population": "331,002,651",
-                "flag": "https://example.com/usa-flag.png"
+                "subregion": "North America", 
+                "population": "331002651",
+                "latitude": "37.09024",
+                "longitude": "-95.712891",
+                "flag": "https://example.com/us-flag.png"
             }
         }
 
 class Country(CountryBase):
-    id: int = Field(..., description="Unique identifier for the country")
+    id: int = Field(..., description="Unique identifier")
 
     class Config:
-        orm_mode = True
-        schema_extra = {
-            "example": {
-                "id": 1,
-                "name": "United States",
-                "code": "USA",
-                "capital": "Washington, D.C.",
-                "region": "Americas",
-                "subregion": "North America",
-                "population": "331,002,651",
-                "flag": "https://example.com/usa-flag.png"
-            }
-        }
\ No newline at end of file
+        orm_mode = True
\ No newline at end of file