diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
diff --git a/build.gradle b/build.gradle
index 9c67c6bb..e75f0753 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,11 +13,21 @@ subprojects {
 
 	apply plugin: 'java-library'
 
-	version "1.3.6"
+	version "1.4.0"
 
 	sourceCompatibility = 14
 	targetCompatibility = 14
 
+	tasks.withType(JavaCompile) {
+		options.compilerArgs += "--enable-preview"
+	}
+	tasks.withType(Test) {
+		jvmArgs += "--enable-preview"
+	}
+	tasks.withType(JavaExec) {
+		jvmArgs += "--enable-preview"
+	}
+
 	java {
 		modularity.inferModulePath = true
 	}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4c5803d1..bb8b2fc2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/org.sheepy.vsand.model/model/VSand.genmodel b/org.sheepy.vsand.model/model/VSand.genmodel
index d3f89149..d52e0861 100644
--- a/org.sheepy.vsand.model/model/VSand.genmodel
+++ b/org.sheepy.vsand.model/model/VSand.genmodel
@@ -2,8 +2,8 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.sheepy.vsand.model/src/generated/java" creationSubmenus="true"
     editDirectory="/org.sheepy.vsand.model.edit/src/generated/java" editorDirectory="/org.sheepy.vsand.model.editor/src/generated/java"
-    modelPluginID="org.sheepy.vsand.model" modelName="VSand" rootExtendsInterface="org.sheepy.lily.core.api.adapter.ILilyEObject"
-    rootExtendsClass="org.sheepy.lily.core.api.adapter.LilyEObject" testsDirectory=""
+    modelPluginID="org.sheepy.vsand.model" modelName="VSand" rootExtendsInterface="org.sheepy.lily.core.api.model.ILilyEObject"
+    rootExtendsClass="org.sheepy.lily.core.api.model.LilyEObject" testsDirectory=""
     booleanFlagsField="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0"
     language="en" usedGenPackages="../../org.sheepy.lily.vulkan.extra.model/model/Extra.genmodel#//nuklear ../../org.sheepy.lily.core.model/model/Lily.genmodel#//ui ../../org.sheepy.lily.core.model/model/Lily.genmodel#//presentation ../../org.sheepy.lily.core.model/model/Lily.genmodel#//application ../../org.sheepy.lily.core.model/model/Lily.genmodel#//variable ../../org.sheepy.lily.core.model/model/Lily.genmodel#//types ../../org.sheepy.lily.core.model/model/Lily.genmodel#//inference ../../org.sheepy.lily.core.model/model/Lily.genmodel#//maintainer ../../org.sheepy.lily.core.model/model/Lily.genmodel#//cadence ../../org.sheepy.lily.core.model/model/Lily.genmodel#//action ../../org.sheepy.lily.vulkan.model/model/LilyVulkan.genmodel#//process ../../org.sheepy.lily.vulkan.model/model/LilyVulkan.genmodel#//resource ../../org.sheepy.lily.vulkan.model/model/LilyVulkan.genmodel#//model ../../org.sheepy.vulkan.model/model/Vulkan.genmodel#//barrier ../../org.sheepy.vulkan.model/model/Vulkan.genmodel#//enumeration ../../org.sheepy.vulkan.model/model/Vulkan.genmodel#//image ../../org.sheepy.vulkan.model/model/Vulkan.genmodel#//pipeline ../../org.sheepy.lily.core.model/model/Lily.genmodel#//resource"
     operationReflection="true" importOrganizing="true" decoration="Live" cleanup="true"
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/DrawCommand.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/DrawCommand.java
index a6da1623..66d4707a 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/DrawCommand.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/DrawCommand.java
@@ -2,7 +2,7 @@
  */
 package org.sheepy.vsand.model;
 
-import org.sheepy.lily.core.api.adapter.ILilyEObject;
+import org.sheepy.lily.core.api.model.ILilyEObject;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/ITransformation.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/ITransformation.java
index 4ca07f15..4faca29a 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/ITransformation.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/ITransformation.java
@@ -2,7 +2,7 @@
  */
 package org.sheepy.vsand.model;
 
-import org.sheepy.lily.core.api.adapter.ILilyEObject;
+import org.sheepy.lily.core.api.model.ILilyEObject;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/Material.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/Material.java
index 762c7646..75b6e915 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/Material.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/Material.java
@@ -2,7 +2,7 @@
  */
 package org.sheepy.vsand.model;
 
-import org.sheepy.lily.core.api.adapter.ILilyEObject;
+import org.sheepy.lily.core.api.model.ILilyEObject;
 import org.sheepy.lily.core.model.resource.Sound;
 
 /**
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/MaterialProvider.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/MaterialProvider.java
index f44f902d..c20a33ef 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/MaterialProvider.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/MaterialProvider.java
@@ -4,7 +4,7 @@
 
 import org.eclipse.emf.common.util.EList;
 
-import org.sheepy.lily.core.api.adapter.ILilyEObject;
+import org.sheepy.lily.core.api.model.ILilyEObject;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/Materials.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/Materials.java
index a89f89ad..1abd2f10 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/Materials.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/Materials.java
@@ -3,7 +3,7 @@
 package org.sheepy.vsand.model;
 
 import org.eclipse.emf.common.util.EList;
-import org.sheepy.lily.core.api.adapter.ILilyEObject;
+import org.sheepy.lily.core.api.model.ILilyEObject;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/Transformations.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/Transformations.java
index 543cf5ad..511167cd 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/Transformations.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/Transformations.java
@@ -3,7 +3,7 @@
 package org.sheepy.vsand.model;
 
 import org.eclipse.emf.common.util.EList;
-import org.sheepy.lily.core.api.adapter.ILilyEObject;
+import org.sheepy.lily.core.api.model.ILilyEObject;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/DrawCircleImpl.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/DrawCircleImpl.java
index 34b85516..3a0f3ad1 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/DrawCircleImpl.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/DrawCircleImpl.java
@@ -8,7 +8,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.sheepy.lily.core.api.adapter.LilyEObject;
+import org.sheepy.lily.core.api.model.LilyEObject;
 import org.sheepy.vsand.model.DrawCircle;
 import org.sheepy.vsand.model.Material;
 import org.sheepy.vsand.model.VSandPackage;
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/DrawLineImpl.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/DrawLineImpl.java
index 582016c7..0be57f88 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/DrawLineImpl.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/DrawLineImpl.java
@@ -8,7 +8,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.sheepy.lily.core.api.adapter.LilyEObject;
+import org.sheepy.lily.core.api.model.LilyEObject;
 import org.sheepy.vsand.model.DrawLine;
 import org.sheepy.vsand.model.Material;
 import org.sheepy.vsand.model.VSandPackage;
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/DrawSquareImpl.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/DrawSquareImpl.java
index 83db15eb..c8c87ea6 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/DrawSquareImpl.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/DrawSquareImpl.java
@@ -8,7 +8,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.sheepy.lily.core.api.adapter.LilyEObject;
+import org.sheepy.lily.core.api.model.LilyEObject;
 import org.sheepy.vsand.model.DrawSquare;
 import org.sheepy.vsand.model.Material;
 import org.sheepy.vsand.model.VSandPackage;
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/InputMaterialProviderImpl.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/InputMaterialProviderImpl.java
index a56dd7f7..6eaa173c 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/InputMaterialProviderImpl.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/InputMaterialProviderImpl.java
@@ -10,7 +10,7 @@
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.sheepy.lily.core.api.adapter.LilyEObject;
+import org.sheepy.lily.core.api.model.LilyEObject;
 
 import org.sheepy.vsand.model.InputMaterialProvider;
 import org.sheepy.vsand.model.Materials;
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MaterialImpl.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MaterialImpl.java
index b34042e7..5718e03f 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MaterialImpl.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MaterialImpl.java
@@ -9,7 +9,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.sheepy.lily.core.api.adapter.LilyEObject;
+import org.sheepy.lily.core.api.model.LilyEObject;
 import org.sheepy.lily.core.model.resource.Sound;
 import org.sheepy.vsand.model.Material;
 import org.sheepy.vsand.model.VSandPackage;
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MaterialProviderImpl.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MaterialProviderImpl.java
index cfeabb5b..a8e77c51 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MaterialProviderImpl.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MaterialProviderImpl.java
@@ -14,7 +14,7 @@
 
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 
-import org.sheepy.lily.core.api.adapter.LilyEObject;
+import org.sheepy.lily.core.api.model.LilyEObject;
 
 import org.sheepy.vsand.model.Material;
 import org.sheepy.vsand.model.MaterialProvider;
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MaterialsImpl.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MaterialsImpl.java
index 1fea86cb..ce436c31 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MaterialsImpl.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MaterialsImpl.java
@@ -13,7 +13,7 @@
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.sheepy.lily.core.api.adapter.LilyEObject;
+import org.sheepy.lily.core.api.model.LilyEObject;
 import org.sheepy.vsand.model.Material;
 import org.sheepy.vsand.model.Materials;
 import org.sheepy.vsand.model.VSandPackage;
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MultipleTransformationImpl.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MultipleTransformationImpl.java
index 8b79ae1e..15c2e334 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MultipleTransformationImpl.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/MultipleTransformationImpl.java
@@ -11,7 +11,7 @@
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.sheepy.lily.core.api.adapter.LilyEObject;
+import org.sheepy.lily.core.api.model.LilyEObject;
 
 import org.sheepy.vsand.model.Material;
 import org.sheepy.vsand.model.MaterialProvider;
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/TransformationImpl.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/TransformationImpl.java
index f1613213..90aa3191 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/TransformationImpl.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/TransformationImpl.java
@@ -9,7 +9,7 @@
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.sheepy.lily.core.api.adapter.LilyEObject;
+import org.sheepy.lily.core.api.model.LilyEObject;
 import org.sheepy.vsand.model.Material;
 import org.sheepy.vsand.model.Transformation;
 import org.sheepy.vsand.model.VSandPackage;
diff --git a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/TransformationsImpl.java b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/TransformationsImpl.java
index ef5f5bae..07ea1c41 100644
--- a/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/TransformationsImpl.java
+++ b/org.sheepy.vsand/src/generated/java/org/sheepy/vsand/model/impl/TransformationsImpl.java
@@ -13,7 +13,7 @@
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.sheepy.lily.core.api.adapter.LilyEObject;
+import org.sheepy.lily.core.api.model.LilyEObject;
 import org.sheepy.vsand.model.ITransformation;
 import org.sheepy.vsand.model.Transformations;
 import org.sheepy.vsand.model.VSandPackage;
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/VSandApplicationLauncher.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/VSandApplicationLauncher.java
index eb1fdc4b..8153c760 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/VSandApplicationLauncher.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/VSandApplicationLauncher.java
@@ -11,7 +11,7 @@
 public class VSandApplicationLauncher
 {
 	private static final String APPLICATION_PATH = "Application.vsand";
-	private static final String APPLICATION_VERSION = "1.3.6";
+	private static final String APPLICATION_VERSION = "1.4.0";
 
 	private static final IResourceLoader resourceLoader = IResourceLoader.INSTANCE;
 
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/audio/MaterialSoundManager.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/audio/MaterialSoundManager.java
index 0567933e..aaca81b7 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/audio/MaterialSoundManager.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/audio/MaterialSoundManager.java
@@ -17,7 +17,7 @@ public void start(Material material)
 		if (paintSound != null)
 		{
 			final var pitch = material.getPitch();
-			final var soundAdapter = paintSound.allocationHandle(IAudioAllocation.class).get();
+			final var soundAdapter = paintSound.adapt(IAudioAllocation.class);
 			audioHandle = soundAdapter.play(audioConfig.builder().pitch(pitch).build());
 		}
 	}
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/constants/PixelConstantBufferAdapter.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/constants/PixelConstantBufferAdapter.java
index 3c407f02..349a5525 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/constants/PixelConstantBufferAdapter.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/constants/PixelConstantBufferAdapter.java
@@ -3,14 +3,11 @@
 import org.lwjgl.system.MemoryUtil;
 import org.sheepy.lily.core.api.adapter.annotation.Adapter;
 import org.sheepy.lily.core.api.adapter.annotation.Dispose;
-import org.sheepy.lily.core.api.adapter.annotation.Load;
 import org.sheepy.lily.core.api.cadence.Tick;
 import org.sheepy.lily.core.api.extender.ModelExtender;
+import org.sheepy.lily.core.api.input.IInputManager;
 import org.sheepy.lily.core.api.util.ModelUtil;
-import org.sheepy.lily.vulkan.api.engine.IVulkanEngineAdapter;
-import org.sheepy.lily.vulkan.api.input.IVulkanInputManager;
 import org.sheepy.lily.vulkan.api.resource.buffer.IConstantBufferUpdater;
-import org.sheepy.lily.vulkan.model.VulkanEngine;
 import org.sheepy.lily.vulkan.model.resource.ConstantBuffer;
 import org.sheepy.vsand.model.PixelConstantBuffer;
 import org.sheepy.vsand.model.VSandApplication;
@@ -28,27 +25,16 @@ public final class PixelConstantBufferAdapter implements IConstantBufferUpdater
 
 	private final PixelConstantBuffer constantBuffer;
 	private final VSandApplication application;
-
-	private ByteBuffer buffer = null;
-
-	private IVulkanInputManager inputManager;
+	private final ByteBuffer buffer;
+	private final IInputManager inputManager;
 
 	private PixelConstantBufferAdapter(PixelConstantBuffer constantBuffer)
 	{
 		this.constantBuffer = constantBuffer;
 
 		application = (VSandApplication) ModelUtil.getApplication(constantBuffer);
-	}
-
-	@Load
-	private void load()
-	{
+		inputManager = application.adapt(IInputManager.class);
 		buffer = MemoryUtil.memAlloc(BYTE_SIZE);
-
-		final var vulkanEngine = (VulkanEngine) application.getEngines().get(0);
-		final var engineAdapter = vulkanEngine.adapt(IVulkanEngineAdapter.class);
-		inputManager = engineAdapter.getInputManager();
-
 		updateBuffer();
 	}
 
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/draw/IDrawCommandAdapter.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/draw/IDrawCommandAdapter.java
index 1868c7f2..f917da36 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/draw/IDrawCommandAdapter.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/draw/IDrawCommandAdapter.java
@@ -2,10 +2,10 @@
 
 import java.nio.ByteBuffer;
 
-import org.sheepy.lily.core.api.adapter.IAdapter;
+import org.sheepy.lily.core.api.extender.IExtender;
 import org.sheepy.vsand.model.DrawCommand;
 
-public interface IDrawCommandAdapter<T extends DrawCommand> extends IAdapter
+public interface IDrawCommandAdapter<T extends DrawCommand> extends IExtender
 {
 	void fillBuffer(T command, ByteBuffer buffer);
 }
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/AbstractDrawer.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/AbstractDrawer.java
index 2b8ee152..3c0dbb87 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/AbstractDrawer.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/AbstractDrawer.java
@@ -1,6 +1,6 @@
 package org.sheepy.vsand.input;
 
-import org.sheepy.lily.core.api.adapter.IAdapter;
+import org.sheepy.lily.core.api.extender.IExtender;
 import org.sheepy.lily.core.api.input.IInputManager;
 import org.sheepy.vsand.audio.MaterialSoundManager;
 import org.sheepy.vsand.draw.DrawManager;
@@ -8,7 +8,7 @@
 import org.sheepy.vsand.model.VSandApplication;
 import org.sheepy.vsand.util.BoardUtil;
 
-abstract class AbstractDrawer implements IAdapter
+abstract class AbstractDrawer implements IExtender
 {
 	private final MaterialSoundManager soundManager = new MaterialSoundManager();
 	private final DrawManager drawManager = new DrawManager();
@@ -21,7 +21,7 @@ abstract class AbstractDrawer implements IAdapter
 	public AbstractDrawer(VSandApplication application)
 	{
 		this.application = application;
-		inputManager = IInputManager.get(application).orElseThrow();
+		inputManager = IInputManager.get(application);
 		inputManager.listen(this::afterPollInputs, IInputManager.Features.AfterPollInputs);
 	}
 
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/InputManager.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/InputManager.java
index 27b641b4..c856a089 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/InputManager.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/InputManager.java
@@ -1,8 +1,8 @@
 package org.sheepy.vsand.input;
 
 import org.eclipse.emf.common.util.EList;
-import org.sheepy.lily.core.api.adapter.IAdapter;
 import org.sheepy.lily.core.api.adapter.annotation.Adapter;
+import org.sheepy.lily.core.api.extender.IExtender;
 import org.sheepy.lily.core.api.extender.ModelExtender;
 import org.sheepy.lily.core.api.input.IInputManager;
 import org.sheepy.lily.core.api.input.event.KeyEvent;
@@ -13,7 +13,7 @@
 
 @ModelExtender(scope = VSandApplication.class)
 @Adapter(lazy = false)
-public final class InputManager implements IAdapter
+public final class InputManager implements IExtender
 {
 	private final VSandApplication application;
 	private final IInputManager inputManager;
@@ -24,7 +24,7 @@ public InputManager(VSandApplication application)
 	{
 		this.application = application;
 
-		inputManager = IInputManager.get(application).orElseThrow();
+		inputManager = IInputManager.get(application);
 		inputManager.showCursor(inputManager.isMouseOnUI());
 		inputManager.listen(this::onMouseOverUI, IInputManager.Features.MouseOverUIEvent);
 		inputManager.listen(this::onKeyEvent, IInputManager.Features.KeyEvent);
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/PrimaryDrawer.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/PrimaryDrawer.java
index d70cbe52..42b9edb9 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/PrimaryDrawer.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/PrimaryDrawer.java
@@ -15,7 +15,7 @@ public PrimaryDrawer(final VSandApplication application)
 	{
 		super(application);
 
-		final var inputManager = IInputManager.get(application).orElseThrow();
+		final var inputManager = IInputManager.get(application);
 		inputManager.listen(this::onMouseClickEvent, IInputManager.Features.MouseClickEvent);
 	}
 
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/SecondaryDrawer.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/SecondaryDrawer.java
index 15436d07..eb441bc7 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/SecondaryDrawer.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/input/SecondaryDrawer.java
@@ -15,7 +15,7 @@ public SecondaryDrawer(final VSandApplication application)
 	{
 		super(application);
 
-		final var inputManager = IInputManager.get(application).orElseThrow();
+		final var inputManager = IInputManager.get(application);
 		inputManager.listen(this::onMouseClickEvent, IInputManager.Features.MouseClickEvent);
 	}
 
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/Board1BufferLoader.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/Board1BufferLoader.java
index 5ff6bde3..8886e7c6 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/Board1BufferLoader.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/Board1BufferLoader.java
@@ -1,10 +1,10 @@
 package org.sheepy.vsand.loader;
 
 import org.lwjgl.system.MemoryUtil;
-import org.sheepy.lily.core.api.adapter.IAdapter;
 import org.sheepy.lily.core.api.adapter.annotation.Adapter;
 import org.sheepy.lily.core.api.adapter.annotation.Dispose;
 import org.sheepy.lily.core.api.adapter.annotation.Load;
+import org.sheepy.lily.core.api.extender.IExtender;
 import org.sheepy.lily.core.api.extender.ModelExtender;
 import org.sheepy.lily.core.api.util.ModelUtil;
 import org.sheepy.lily.vulkan.model.resource.Buffer;
@@ -14,7 +14,7 @@
 
 @ModelExtender(scope = Buffer.class, name = "Board Buffer 1")
 @Adapter(singleton = true, lazy = false)
-public final class Board1BufferLoader implements IAdapter
+public final class Board1BufferLoader implements IExtender
 {
 	@Load
 	private static void load(Buffer buffer)
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/Board2BufferLoader.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/Board2BufferLoader.java
index 63317da6..3ce1bb28 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/Board2BufferLoader.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/Board2BufferLoader.java
@@ -3,10 +3,10 @@
 import java.nio.ByteBuffer;
 
 import org.lwjgl.system.MemoryUtil;
-import org.sheepy.lily.core.api.adapter.IAdapter;
 import org.sheepy.lily.core.api.adapter.annotation.Adapter;
 import org.sheepy.lily.core.api.adapter.annotation.Dispose;
 import org.sheepy.lily.core.api.adapter.annotation.Load;
+import org.sheepy.lily.core.api.extender.IExtender;
 import org.sheepy.lily.core.api.extender.ModelExtender;
 import org.sheepy.lily.core.api.util.ModelUtil;
 import org.sheepy.lily.vulkan.model.resource.Buffer;
@@ -14,7 +14,7 @@
 
 @ModelExtender(scope = Buffer.class, name = "Board Buffer 2")
 @Adapter(singleton = true, lazy = false)
-public final class Board2BufferLoader implements IAdapter
+public final class Board2BufferLoader implements IExtender
 {
 	@Load
 	private static void load(Buffer buffer)
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/BoardImageLoader.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/BoardImageLoader.java
index 74043430..02537f29 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/BoardImageLoader.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/BoardImageLoader.java
@@ -1,8 +1,8 @@
 package org.sheepy.vsand.loader;
 
-import org.sheepy.lily.core.api.adapter.IAdapter;
 import org.sheepy.lily.core.api.adapter.annotation.Adapter;
 import org.sheepy.lily.core.api.adapter.annotation.Load;
+import org.sheepy.lily.core.api.extender.IExtender;
 import org.sheepy.lily.core.api.extender.ModelExtender;
 import org.sheepy.lily.core.api.util.ModelUtil;
 import org.sheepy.lily.vulkan.model.resource.StaticImage;
@@ -11,7 +11,7 @@
 
 @ModelExtender(scope = StaticImage.class, name = "Board Image")
 @Adapter(singleton = true, lazy = false)
-public final class BoardImageLoader implements IAdapter
+public final class BoardImageLoader implements IExtender
 {
 	@Load
 	private static void load(StaticImage image)
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/ChunkBufferLoader.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/ChunkBufferLoader.java
index da13fbaf..1185256a 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/ChunkBufferLoader.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/ChunkBufferLoader.java
@@ -1,10 +1,10 @@
 package org.sheepy.vsand.loader;
 
 import org.lwjgl.system.MemoryUtil;
-import org.sheepy.lily.core.api.adapter.IAdapter;
 import org.sheepy.lily.core.api.adapter.annotation.Adapter;
 import org.sheepy.lily.core.api.adapter.annotation.Dispose;
 import org.sheepy.lily.core.api.adapter.annotation.Load;
+import org.sheepy.lily.core.api.extender.IExtender;
 import org.sheepy.lily.core.api.extender.ModelExtender;
 import org.sheepy.lily.core.api.util.ModelUtil;
 import org.sheepy.lily.vulkan.model.resource.Buffer;
@@ -14,7 +14,7 @@
 
 @ModelExtender(scope = Buffer.class, name = "Chunk Buffer")
 @Adapter(singleton = true, lazy = false)
-public final class ChunkBufferLoader implements IAdapter
+public final class ChunkBufferLoader implements IExtender
 {
 	@Load
 	private static void load(Buffer buffer)
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/ConfigurationBufferLoader.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/ConfigurationBufferLoader.java
index c21a5d58..51f2d70c 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/ConfigurationBufferLoader.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/ConfigurationBufferLoader.java
@@ -2,10 +2,10 @@
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.lwjgl.system.MemoryUtil;
-import org.sheepy.lily.core.api.adapter.IAdapter;
 import org.sheepy.lily.core.api.adapter.annotation.Adapter;
 import org.sheepy.lily.core.api.adapter.annotation.Dispose;
 import org.sheepy.lily.core.api.adapter.annotation.Load;
+import org.sheepy.lily.core.api.extender.IExtender;
 import org.sheepy.lily.core.api.extender.ModelExtender;
 import org.sheepy.lily.vulkan.model.resource.Buffer;
 import org.sheepy.vsand.model.Material;
@@ -15,7 +15,7 @@
 
 @ModelExtender(scope = Buffer.class, name = "Configuration")
 @Adapter(singleton = true, lazy = false)
-public final class ConfigurationBufferLoader implements IAdapter
+public final class ConfigurationBufferLoader implements IExtender
 {
 	private static final int UNIT_BYTES = 8 * Integer.BYTES;
 
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/MaterialCountAdapter.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/MaterialCountAdapter.java
index 8103454a..93bf7fc1 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/MaterialCountAdapter.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/MaterialCountAdapter.java
@@ -2,9 +2,9 @@
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.lwjgl.system.MemoryUtil;
-import org.sheepy.lily.core.api.adapter.IAdapter;
 import org.sheepy.lily.core.api.adapter.annotation.Adapter;
 import org.sheepy.lily.core.api.adapter.annotation.Load;
+import org.sheepy.lily.core.api.extender.IExtender;
 import org.sheepy.lily.core.api.extender.ModelExtender;
 import org.sheepy.lily.vulkan.model.resource.ConstantBuffer;
 import org.sheepy.vsand.model.VSandApplication;
@@ -13,7 +13,7 @@
 
 @ModelExtender(scope = ConstantBuffer.class, name = "MaterialCount")
 @Adapter(singleton = true, lazy = false)
-public final class MaterialCountAdapter implements IAdapter
+public final class MaterialCountAdapter implements IExtender
 {
 	@Load
 	private static void load(ConstantBuffer buffer)
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/TransformationBufferLoader.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/TransformationBufferLoader.java
index 254c9831..d5e4166e 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/TransformationBufferLoader.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/loader/TransformationBufferLoader.java
@@ -2,10 +2,10 @@
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.lwjgl.system.MemoryUtil;
-import org.sheepy.lily.core.api.adapter.IAdapter;
 import org.sheepy.lily.core.api.adapter.annotation.Adapter;
 import org.sheepy.lily.core.api.adapter.annotation.Dispose;
 import org.sheepy.lily.core.api.adapter.annotation.Load;
+import org.sheepy.lily.core.api.extender.IExtender;
 import org.sheepy.lily.core.api.extender.ModelExtender;
 import org.sheepy.lily.vulkan.model.resource.Buffer;
 import org.sheepy.vsand.model.VSandApplication;
@@ -13,7 +13,7 @@
 
 @ModelExtender(scope = Buffer.class, name = "Transformation")
 @Adapter(singleton = true, lazy = false)
-public final class TransformationBufferLoader implements IAdapter
+public final class TransformationBufferLoader implements IExtender
 {
 	@Load
 	private static void load(Buffer buffer)
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/logic/ApplicationBehaviour.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/logic/ApplicationBehaviour.java
index 3fcf1702..a5fd05ef 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/logic/ApplicationBehaviour.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/logic/ApplicationBehaviour.java
@@ -1,16 +1,16 @@
 package org.sheepy.vsand.logic;
 
 import org.eclipse.emf.common.notify.Notification;
-import org.sheepy.lily.core.api.adapter.IAdapter;
 import org.sheepy.lily.core.api.adapter.annotation.Adapter;
 import org.sheepy.lily.core.api.adapter.annotation.NotifyChanged;
+import org.sheepy.lily.core.api.extender.IExtender;
 import org.sheepy.lily.core.api.extender.ModelExtender;
 import org.sheepy.vsand.model.VSandApplication;
 import org.sheepy.vsand.model.VSandPackage;
 
 @ModelExtender(scope = VSandApplication.class)
 @Adapter(singleton = true, lazy = false)
-public final class ApplicationBehaviour implements IAdapter
+public final class ApplicationBehaviour implements IExtender
 {
 	@NotifyChanged(featureIds = VSandPackage.VSAND_APPLICATION__NEXT_MODE)
 	private static void nextModeChanged(Notification notification)
diff --git a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/logic/VSandMainLoop.java b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/logic/VSandMainLoop.java
index af4143c2..b371eca2 100644
--- a/org.sheepy.vsand/src/main/java/org/sheepy/vsand/logic/VSandMainLoop.java
+++ b/org.sheepy.vsand/src/main/java/org/sheepy/vsand/logic/VSandMainLoop.java
@@ -16,10 +16,10 @@ public final class VSandMainLoop implements Runnable
 	private final VSandApplication application;
 	private final boolean benchmarkMode;
 	private final int stopIteration;
-	private final IProcessAdapter boardProcessAdapter;
-	private final IProcessAdapter renderProcessAdapter;
-	private final IPipelineTask boardImageBarrier;
 
+	private IProcessAdapter boardProcessAdapter;
+	private IProcessAdapter renderProcessAdapter;
+	private IPipelineTask boardImageBarrier;
 	private boolean loaded = false;
 	private long currentIteration = 0;
 	private long startNs;
@@ -41,14 +41,6 @@ private VSandMainLoop(VSandApplication application, boolean benchmarkMode, int s
 		this.application = application;
 		this.benchmarkMode = benchmarkMode;
 		this.stopIteration = stopIteration;
-
-		final var vulkanEngine = (VulkanEngine) application.getEngines().get(0);
-		final var processes = vulkanEngine.getProcesses();
-		final var boardProcess = (ComputeProcess) processes.get(0);
-		final var boardToPixelPipeline = (ComputePipeline) (boardProcess.getPipelinePkg().getPipelines().get(2));
-		boardProcessAdapter = boardProcess.adaptNotNull(IProcessAdapter.class);
-		boardImageBarrier = boardToPixelPipeline.getTaskPkg().getTasks().get(2);
-		renderProcessAdapter = processes.get(1).adaptNotNull(IProcessAdapter.class);
 	}
 
 	@Override
@@ -99,6 +91,13 @@ else if (renderProcessAdapter != null)
 	private void load()
 	{
 		final var vulkanEngine = (VulkanEngine) application.getEngines().get(0);
+		final var processes = vulkanEngine.getProcesses();
+		final var boardProcess = (ComputeProcess) processes.get(0);
+		final var boardToPixelPipeline = (ComputePipeline) (boardProcess.getPipelinePkg().getPipelines().get(2));
+		boardProcessAdapter = boardProcess.adaptNotNull(IProcessAdapter.class);
+		boardImageBarrier = boardToPixelPipeline.getTaskPkgs().get(0).getTasks().get(2);
+		renderProcessAdapter = processes.get(1).adaptNotNull(IProcessAdapter.class);
+
 		final var engineAdapter = vulkanEngine.adapt(IVulkanEngineAdapter.class);
 		final var window = engineAdapter.getWindow();
 		if (window != null)
diff --git a/org.sheepy.vsand/src/main/resources/Application.vsand b/org.sheepy.vsand/src/main/resources/Application.vsand
index 94e3f6db..03ec9b59 100644
--- a/org.sheepy.vsand/src/main/resources/Application.vsand
+++ b/org.sheepy.vsand/src/main/resources/Application.vsand
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model:VSandApplication xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="org.sheepy.lily.core.model.application" xmlns:compute="org.sheepy.lily.vulkan.model.process.compute" xmlns:graphic="org.sheepy.lily.vulkan.model.process.graphic" xmlns:model="org.sheepy.vsand.model" xmlns:model_1="org.sheepy.lily.vulkan.model" xmlns:nuklear="org.sheepy.lily.vulkan.extra.model.nuklear" xmlns:openal="org.sheepy.lily.openal" xmlns:process="org.sheepy.lily.vulkan.model.process" xmlns:resource="org.sheepy.lily.vulkan.model.resource" xmlns:resource_1="org.sheepy.lily.core.model.resource" xmlns:ui="org.sheepy.lily.core.model.ui" xmlns:variable="org.sheepy.lily.core.model.variable" title="VSand" mainMaterial="//@materials/@materials.1" secondaryMaterial="//@materials/@materials.3" boardUpdateTask="//@engines.0/@processes.0/@pipelinePkg/@pipelines.1/@taskPkg/@tasks.2" size="1248;704">
+<model:VSandApplication xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="org.sheepy.lily.core.model.application" xmlns:compute="org.sheepy.lily.vulkan.model.process.compute" xmlns:graphic="org.sheepy.lily.vulkan.model.process.graphic" xmlns:model="org.sheepy.vsand.model" xmlns:model_1="org.sheepy.lily.vulkan.model" xmlns:nuklear="org.sheepy.lily.vulkan.extra.model.nuklear" xmlns:openal="org.sheepy.lily.openal" xmlns:process="org.sheepy.lily.vulkan.model.process" xmlns:resource="org.sheepy.lily.vulkan.model.resource" xmlns:resource_1="org.sheepy.lily.core.model.resource" xmlns:ui="org.sheepy.lily.core.model.ui" xmlns:variable="org.sheepy.lily.core.model.variable" title="VSand" mainMaterial="//@materials/@materials.1" secondaryMaterial="//@materials/@materials.3" boardUpdateTask="//@engines.0/@processes.0/@pipelinePkg/@pipelines.1/@taskPkgs.0/@tasks.2" size="1248;704">
   <engines xsi:type="model_1:VulkanEngine">
     <resourcePkg>
       <resources xsi:type="resource:StaticImage" name="Board Image" fillWithZero="true" size="1248;704">
@@ -70,31 +70,34 @@
       </descriptorPkg>
       <descriptorPool/>
       <pipelinePkg>
-        <pipelines xsi:type="compute:ComputePipeline" name="Draw" enabled="false" stage="Compute" specializationData="//@engines.0/@processes.0/@resourcePkg/@resources.9" layout="//@engines.0/@processes.0/@pipelinePkg/@pipelines.0/@descriptorPool/@descriptorSets.0" shader="//@engines.0/@processes.0/@resourcePkg/@resources.5">
+        <pipelines xsi:type="compute:ComputePipeline" name="Draw" enabled="false" specializationData="//@engines.0/@processes.0/@resourcePkg/@resources.9" layout="//@engines.0/@processes.0/@pipelinePkg/@pipelines.0/@descriptorPool/@descriptorSets.0" shader="//@engines.0/@processes.0/@resourcePkg/@resources.5">
           <resourcePkg>
             <resources xsi:type="model:DrawConstantBuffer" boardConstantBuffer="//@engines.0/@processes.0/@resourcePkg/@resources.8"/>
           </resourcePkg>
-          <taskPkg>
+          <taskPkgs>
             <tasks xsi:type="process:BindDescriptorSets" descriptorSets="//@engines.0/@processes.0/@pipelinePkg/@pipelines.0/@descriptorPool/@descriptorSets.0" bindPoint="COMPUTE"/>
             <tasks xsi:type="process:PushConstantBuffer" name="" buffer="//@engines.0/@processes.0/@pipelinePkg/@pipelines.0/@resourcePkg/@resources.0">
               <stages>COMPUTE_BIT</stages>
             </tasks>
             <tasks xsi:type="process:PipelineBarrier" srcStage="COMPUTE_SHADER_BIT" dstStage="COMPUTE_SHADER_BIT">
-              <barriers xsi:type="resource:BufferBarrier" buffer="//@engines.0/@processes.0/@resourcePkg/@resources.0">
+              <barriers xsi:type="resource:BufferBarrier">
                 <srcAccessMask>SHADER_READ_BIT</srcAccessMask>
                 <dstAccessMask>SHADER_WRITE_BIT</dstAccessMask>
+                <buffers xsi:type="resource:FixedBufferReference" buffers="//@engines.0/@processes.0/@resourcePkg/@resources.0"/>
               </barriers>
-              <barriers xsi:type="resource:BufferBarrier" buffer="//@engines.0/@processes.0/@resourcePkg/@resources.2">
+              <barriers xsi:type="resource:BufferBarrier">
                 <srcAccessMask>SHADER_READ_BIT</srcAccessMask>
                 <dstAccessMask>SHADER_WRITE_BIT</dstAccessMask>
+                <buffers xsi:type="resource:FixedBufferReference" buffers="//@engines.0/@processes.0/@resourcePkg/@resources.2"/>
               </barriers>
-              <barriers xsi:type="resource:BufferBarrier" buffer="//@engines.0/@processes.0/@resourcePkg/@resources.1">
+              <barriers xsi:type="resource:BufferBarrier">
                 <srcAccessMask>SHADER_READ_BIT</srcAccessMask>
                 <dstAccessMask>SHADER_WRITE_BIT</dstAccessMask>
+                <buffers xsi:type="resource:FixedBufferReference" buffers="//@engines.0/@processes.0/@resourcePkg/@resources.1"/>
               </barriers>
             </tasks>
             <tasks xsi:type="compute:DispatchTask" name="Draw" workgroupCountX="78" workgroupCountY="44"/>
-          </taskPkg>
+          </taskPkgs>
           <descriptorPool>
             <descriptorSets name="Draw" descriptors="//@engines.0/@processes.0/@descriptorPkg/@descriptors.0 //@engines.0/@processes.0/@descriptorPkg/@descriptors.1 //@engines.0/@processes.0/@descriptorPkg/@descriptors.2"/>
           </descriptorPool>
@@ -102,21 +105,24 @@
             <stages>COMPUTE_BIT</stages>
           </pushConstantRanges>
         </pipelines>
-        <pipelines xsi:type="compute:ComputePipeline" name="Step" stage="Compute" specializationData="//@engines.0/@processes.0/@resourcePkg/@resources.9" layout="//@engines.0/@processes.0/@pipelinePkg/@pipelines.1/@descriptorPool/@descriptorSets.0" shader="//@engines.0/@processes.0/@resourcePkg/@resources.6">
-          <taskPkg>
+        <pipelines xsi:type="compute:ComputePipeline" name="Step" specializationData="//@engines.0/@processes.0/@resourcePkg/@resources.9" layout="//@engines.0/@processes.0/@pipelinePkg/@pipelines.1/@descriptorPool/@descriptorSets.0" shader="//@engines.0/@processes.0/@resourcePkg/@resources.6">
+          <taskPkgs>
             <tasks xsi:type="process:BindDescriptorSets" descriptorSets="//@engines.0/@processes.0/@pipelinePkg/@pipelines.1/@descriptorPool/@descriptorSets.0" bindPoint="COMPUTE"/>
             <tasks xsi:type="process:PipelineBarrier" srcStage="COMPUTE_SHADER_BIT" dstStage="COMPUTE_SHADER_BIT">
-              <barriers xsi:type="resource:BufferBarrier" buffer="//@engines.0/@processes.0/@resourcePkg/@resources.1">
+              <barriers xsi:type="resource:BufferBarrier">
                 <srcAccessMask>SHADER_READ_BIT</srcAccessMask>
                 <dstAccessMask>SHADER_WRITE_BIT</dstAccessMask>
+                <buffers xsi:type="resource:FixedBufferReference" buffers="//@engines.0/@processes.0/@resourcePkg/@resources.1"/>
               </barriers>
-              <barriers xsi:type="resource:BufferBarrier" buffer="//@engines.0/@processes.0/@resourcePkg/@resources.2">
+              <barriers xsi:type="resource:BufferBarrier">
                 <srcAccessMask>SHADER_READ_BIT</srcAccessMask>
                 <dstAccessMask>SHADER_WRITE_BIT</dstAccessMask>
+                <buffers xsi:type="resource:FixedBufferReference" buffers="//@engines.0/@processes.0/@resourcePkg/@resources.2"/>
               </barriers>
-              <barriers xsi:type="resource:BufferBarrier" buffer="//@engines.0/@processes.0/@resourcePkg/@resources.0">
+              <barriers xsi:type="resource:BufferBarrier">
                 <srcAccessMask>SHADER_READ_BIT</srcAccessMask>
                 <dstAccessMask>SHADER_WRITE_BIT</dstAccessMask>
+                <buffers xsi:type="resource:FixedBufferReference" buffers="//@engines.0/@processes.0/@resourcePkg/@resources.0"/>
               </barriers>
             </tasks>
             <tasks xsi:type="process:CompositeTask" name="Update Board">
@@ -125,7 +131,7 @@
               </tasks>
               <tasks xsi:type="compute:DispatchTask" name="Board update" workgroupCountX="78" workgroupCountY="44"/>
             </tasks>
-          </taskPkg>
+          </taskPkgs>
           <descriptorPool>
             <descriptorSets name="Update Board Common" descriptors="//@engines.0/@processes.0/@descriptorPkg/@descriptors.3 //@engines.0/@processes.0/@descriptorPkg/@descriptors.4 //@engines.0/@processes.0/@descriptorPkg/@descriptors.0 //@engines.0/@processes.0/@descriptorPkg/@descriptors.1 //@engines.0/@processes.0/@descriptorPkg/@descriptors.2"/>
           </descriptorPool>
@@ -133,11 +139,11 @@
             <stages>COMPUTE_BIT</stages>
           </pushConstantRanges>
         </pipelines>
-        <pipelines xsi:type="compute:ComputePipeline" name="Board to Pixel" stage="Compute" specializationData="//@engines.0/@processes.0/@resourcePkg/@resources.9" layout="//@engines.0/@processes.0/@pipelinePkg/@pipelines.2/@descriptorPool/@descriptorSets.0" shader="//@engines.0/@processes.0/@resourcePkg/@resources.7">
+        <pipelines xsi:type="compute:ComputePipeline" name="Board to Pixel" specializationData="//@engines.0/@processes.0/@resourcePkg/@resources.9" layout="//@engines.0/@processes.0/@pipelinePkg/@pipelines.2/@descriptorPool/@descriptorSets.0" shader="//@engines.0/@processes.0/@resourcePkg/@resources.7">
           <resourcePkg>
             <resources xsi:type="model:PixelConstantBuffer" boardConstantBuffer="//@engines.0/@processes.0/@resourcePkg/@resources.8"/>
           </resourcePkg>
-          <taskPkg>
+          <taskPkgs>
             <tasks xsi:type="process:BindDescriptorSets" descriptorSets="//@engines.0/@processes.0/@pipelinePkg/@pipelines.2/@descriptorPool/@descriptorSets.0" bindPoint="COMPUTE"/>
             <tasks xsi:type="process:PushConstantBuffer" name="" buffer="//@engines.0/@processes.0/@pipelinePkg/@pipelines.2/@resourcePkg/@resources.0">
               <stages>COMPUTE_BIT</stages>
@@ -149,21 +155,24 @@
               </barriers>
             </tasks>
             <tasks xsi:type="process:PipelineBarrier" srcStage="COMPUTE_SHADER_BIT" dstStage="COMPUTE_SHADER_BIT">
-              <barriers xsi:type="resource:BufferBarrier" buffer="//@engines.0/@processes.0/@resourcePkg/@resources.0">
+              <barriers xsi:type="resource:BufferBarrier">
                 <srcAccessMask>SHADER_WRITE_BIT</srcAccessMask>
                 <dstAccessMask>SHADER_READ_BIT</dstAccessMask>
+                <buffers xsi:type="resource:FixedBufferReference" buffers="//@engines.0/@processes.0/@resourcePkg/@resources.0"/>
               </barriers>
-              <barriers xsi:type="resource:BufferBarrier" buffer="//@engines.0/@processes.0/@resourcePkg/@resources.2">
+              <barriers xsi:type="resource:BufferBarrier">
                 <srcAccessMask>SHADER_WRITE_BIT</srcAccessMask>
                 <dstAccessMask>SHADER_READ_BIT</dstAccessMask>
+                <buffers xsi:type="resource:FixedBufferReference" buffers="//@engines.0/@processes.0/@resourcePkg/@resources.2"/>
               </barriers>
-              <barriers xsi:type="resource:BufferBarrier" buffer="//@engines.0/@processes.0/@resourcePkg/@resources.1">
+              <barriers xsi:type="resource:BufferBarrier">
                 <srcAccessMask>SHADER_WRITE_BIT</srcAccessMask>
                 <dstAccessMask>SHADER_READ_BIT</dstAccessMask>
+                <buffers xsi:type="resource:FixedBufferReference" buffers="//@engines.0/@processes.0/@resourcePkg/@resources.1"/>
               </barriers>
             </tasks>
             <tasks xsi:type="compute:DispatchTask" workgroupCountX="78" workgroupCountY="44"/>
-          </taskPkg>
+          </taskPkgs>
           <descriptorPool>
             <descriptorSets name="Board to Pixel" descriptors="//@engines.0/@processes.0/@descriptorPkg/@descriptors.5 //@engines.0/@processes.0/@descriptorPkg/@descriptors.3 //@engines.0/@processes.0/@descriptorPkg/@descriptors.0 //@engines.0/@processes.0/@descriptorPkg/@descriptors.1 //@engines.0/@processes.0/@descriptorPkg/@descriptors.2"/>
           </descriptorPool>
@@ -172,21 +181,26 @@
           </pushConstantRanges>
         </pipelines>
       </pipelinePkg>
+      <configuration/>
+      <executionManager/>
     </processes>
     <processes xsi:type="graphic:GraphicProcess" resetAllowed="true">
+      <descriptorPool/>
       <configuration acquireWaitStage="COMPUTE_SHADER_BIT">
         <swapchainConfiguration requiredSwapImageCount="2" allowingAccessFromCompute="true">
           <swapImageUsages>ColorAttachment</swapImageUsages>
           <swapImageUsages>TransferDst</swapImageUsages>
+          <colorAttachment name="Swapchain" stencilLoadOp="DONT_CARE" stencilStoreOp="DONT_CARE" initialLayout="TRANSFER_DST_OPTIMAL" finalLayout="PRESENT_SRC_KHR" clearValue="0.0;0.0;0.0;0.0"/>
         </swapchainConfiguration>
-        <framebufferConfiguration clearValue="0.0;0.0;0.0;0.0"/>
+        <framebufferConfiguration/>
         <surface>
           <colorDomain/>
         </surface>
         <renderPass/>
         <imageViews/>
       </configuration>
-      <colorAttachment name="Swapchain" stencilLoadOp="DONT_CARE" stencilStoreOp="DONT_CARE" initialLayout="TRANSFER_DST_OPTIMAL" finalLayout="PRESENT_SRC_KHR"/>
+      <executionManager/>
+      <attachmentPkg/>
     </processes>
   </engines>
   <engines xsi:type="openal:OpenALEngine">
@@ -209,16 +223,16 @@
     </resourcePkg>
   </engines>
   <scene resizeable="true" size="1248;704">
-    <compositors xsi:type="application:BackgroundImage" sampling="Nearest" srcImage="//@engines.0/@resourcePkg/@resources.0" dstImage="//@engines.0/@processes.1/@colorAttachment"/>
-    <compositors xsi:type="ui:UI" imageSupport="false" currentUIPage="//@scene/@compositors.1/@uiPages.0" dstImage="//@engines.0/@processes.1/@colorAttachment">
+    <compositors xsi:type="application:BackgroundImage" sampling="Nearest" srcImage="//@engines.0/@resourcePkg/@resources.0" dstImage="//@engines.0/@processes.1/@configuration/@swapchainConfiguration/@colorAttachment"/>
+    <compositors xsi:type="ui:UI" imageSupport="false" currentUIPage="//@scene/@compositors.1/@uiPages.0" dstImage="//@engines.0/@processes.1/@configuration/@swapchainConfiguration/@colorAttachment">
       <uiPages>
         <panels xsi:type="ui:Panel" name="Config" horizontalRelative="RIGHT" width="220" height="90">
           <controls xsi:type="ui:DynamicRowLayout"/>
           <controls xsi:type="ui:VariableLabel" text="Speed">
-            <variableResolver xsi:type="variable:DirectVariableResolver" variableDefinition="org.sheepy.lily.vulkan.model.process#CompositeTask#repeatCount" target="//@engines.0/@processes.0/@pipelinePkg/@pipelines.1/@taskPkg/@tasks.2"/>
+            <variableResolver xsi:type="variable:DirectVariableResolver" variableDefinition="org.sheepy.lily.vulkan.model.process#CompositeTask#repeatCount" target="//@engines.0/@processes.0/@pipelinePkg/@pipelines.1/@taskPkgs.0/@tasks.2"/>
           </controls>
           <controls xsi:type="ui:Slider" minValue="1" maxValue="16">
-            <variableResolver xsi:type="variable:DirectVariableResolver" variableDefinition="org.sheepy.lily.vulkan.model.process#CompositeTask#repeatCount" target="//@engines.0/@processes.0/@pipelinePkg/@pipelines.1/@taskPkg/@tasks.2"/>
+            <variableResolver xsi:type="variable:DirectVariableResolver" variableDefinition="org.sheepy.lily.vulkan.model.process#CompositeTask#repeatCount" target="//@engines.0/@processes.0/@pipelinePkg/@pipelines.1/@taskPkgs.0/@tasks.2"/>
           </controls>
           <controls xsi:type="ui:VariableLabel" text="Brush Size">
             <variableResolver xsi:type="variable:DirectVariableResolver" variableDefinition="org.sheepy.vsand.model#VSandApplication#brushSize" target="/"/>