diff --git a/devfile_next.plantuml b/devfile_next.plantuml
index b3db5c9..9b39473 100644
--- a/devfile_next.plantuml
+++ b/devfile_next.plantuml
@@ -22,6 +22,7 @@ Devfile *-- "n" Project
 
 class Metadata {
   - name
+  - generateName
 }
 
 class Component {
@@ -50,6 +51,7 @@ class CommandAction {
   - command
   - reference
   - referenceContent
+  - workdir
 }
 
 class Project {
@@ -84,6 +86,26 @@ class Dockerimage {
    - args
 }
 
+Dockerimage <|-.. Env
+Dockerimage <|-.. Volumes
+Dockerimage <|-.. Endpoints
+
+class Env {
+   - name
+   - value
+}
+
+class Volumes {
+   - name
+   - containerPath
+}
+
+class Endpoints {
+   - name
+   - port
+   - attributes
+}
+
 class Openshift {
   - reference
   - referenceContent
diff --git a/devfile_next.png b/devfile_next.png
index b1c63b1..b77f81c 100644
Binary files a/devfile_next.png and b/devfile_next.png differ