diff --git a/src/main/asciidoc/models/design/catalog.puml b/src/main/asciidoc/models/design/catalog.puml
index 334b060..e62c655 100644
--- a/src/main/asciidoc/models/design/catalog.puml
+++ b/src/main/asciidoc/models/design/catalog.puml
@@ -8,13 +8,12 @@ package javax.money {
 
 package Salespoint {
     'https://st.inf.tu-dresden.de/SalesPoint/api//org/salespointframework/catalog/Catalog.html'
-    interface Catalog << T > Product >> {
+    interface Catalog<T extends Product> {
         findByAnyCategory(categories : String) : Streamable<Product>
         findByAllCategories(categories : String) : Streamable<Product>
 
     }
     interface DataInitializer
-    interface Inventory << T > InventoryItem >>
     class Product {
         - name : String
         - price : MonetaryAmount
@@ -41,8 +40,8 @@ package catering.catalog {
     interface ConsumableCatalog {
         + DEFAULT_SORT : Sort
     }
-        RentableCatalog ..> Catalog : "<bind> <T->Rentable"
-        ConsumableCatalog ..> Catalog : "<bind> <T->Catalog"
+        RentableCatalog --|> Catalog
+        ConsumableCatalog --|> Catalog
 
     class Consumable {
       - promotionPrice : MonetaryAmount
@@ -58,7 +57,7 @@ package catering.catalog {
       + setWholeSalePrice(price : MonetaryAmount)
     }
         Consumable --|> Product
-        Consumable ..> MonetaryAmount : use
+        Consumable ..> MonetaryAmount
 
     class Rentable {
         + Rentable(name : String, pricePerHour : MonetaryAmount) : Rentable
@@ -73,6 +72,6 @@ package catering.catalog {
         CatalogDataInitalizer ..|> DataInitializer
 }
 
-'#TODO: to determine which Products of a Category to offer I need to retrieve information about availability of e.g. Cooks and ServicePersonel from the Users or Rentables from the Inventory'
+'#TODO: to determine which Products of a Category to offer I need to retrieve information about availability of e.g. Cooks and ServicePersonel from the <<use>>rs or Rentables from the Inventory'
 
 @enduml