diff --git a/pyrohlik/models/product.py b/pyrohlik/models/product.py
index ee88e21..86cc937 100644
--- a/pyrohlik/models/product.py
+++ b/pyrohlik/models/product.py
@@ -12,7 +12,7 @@ class Price(BaseModel):
 class Badge(BaseModel):
     type: str
     title: str
-    subtitle: str
+    subtitle: Optional[str]
     tooltip: Optional[str]
 
 
@@ -45,6 +45,13 @@ class SaleStock(BaseModel):
     shelf_life: Optional[str] = Field(..., alias='shelfLife')    
 
 
+class ShelfLife(BaseModel):
+    average: int
+    minimal: int
+    type: str
+    bestBefore: Optional[str]
+
+
 class Stock(BaseModel):    
     warehouse_id: int = Field(..., alias='warehouseId')
     unavailability_reason: Optional[str] = Field(..., alias='unavailabilityReason')
@@ -54,7 +61,7 @@ class Stock(BaseModel):
     delivery_restriction: Optional[str] = Field(..., alias='deliveryRestriction')
     expected_replenishment: Optional[datetime] = Field(..., alias='expectedReplenishment')
     availability_dimension: int = Field(..., alias='availabilityDimension')
-    shelf_life: Optional[str] = Field(..., alias='shelfLife')
+    shelf_life: Optional[ShelfLife] = Field(..., alias='shelfLife')
     billable_packaging: Optional[str] = Field(..., alias='billablePackaging')
     sales: List[SaleStock]
     in_stock: bool = Field(..., alias='inStock')
@@ -74,7 +81,7 @@ class Allergens(BaseModel):
 
 
 class AmountUnit(BaseModel):
-    amount: Decimal
+    amount: Optional[Decimal]
     unit: str