diff --git a/src/Basket.API/Model/BasketItem.cs b/src/Basket.API/Model/BasketItem.cs
index 55c8a97c2..5af345fa8 100644
--- a/src/Basket.API/Model/BasketItem.cs
+++ b/src/Basket.API/Model/BasketItem.cs
@@ -16,7 +16,13 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
 
         if (Quantity < 1)
         {
-            results.Add(new ValidationResult("Invalid number of units", new[] { "Quantity" }));
+            results.Add(new ValidationResult("🤌 Numero di unità non valido", new[] { "Quantity" }));
+        }
+
+        // Validate the URL if it's a valid URL format
+        if (!string.IsNullOrEmpty(PictureUrl) && !Uri.IsWellFormedUriString(PictureUrl, UriKind.Absolute))
+        {
+            results.Add(new ValidationResult("🤌 Formato URL non valido", new[] { "PictureUrl" }));
         }
 
         return results;
diff --git a/src/Basket.API/Model/CustomerBasket.cs b/src/Basket.API/Model/CustomerBasket.cs
index 8ec8828bf..32a8cfe34 100644
--- a/src/Basket.API/Model/CustomerBasket.cs
+++ b/src/Basket.API/Model/CustomerBasket.cs
@@ -1,13 +1,31 @@
 namespace eShop.Basket.API.Model;
 
+/// <summary>
+/// Represents a shopping basket for a specific customer, containing a collection of basket items.
+/// </summary>
 public class CustomerBasket
 {
+    /// <summary>
+    /// Gets or sets the unique identifier of the buyer associated with this basket.
+    /// </summary>
     public string BuyerId { get; set; }
 
+    /// <summary>
+    /// Gets or sets the list of items in the customer's basket.
+    /// Initialized as an empty list by default.
+    /// </summary>
     public List<BasketItem> Items { get; set; } = [];
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CustomerBasket"/> class.
+    /// </summary>
     public CustomerBasket() { }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CustomerBasket"/> class
+    /// with the specified customer identifier.
+    /// </summary>
+    /// <param name="customerId">The unique identifier of the customer.</param>
     public CustomerBasket(string customerId)
     {
         BuyerId = customerId;