diff --git a/bundles/specmate-model-ecore/model/specmate.ecore b/bundles/specmate-model-ecore/model/specmate.ecore
index 6d47dbfd8..9ee69751f 100644
--- a/bundles/specmate-model-ecore/model/specmate.ecore
+++ b/bundles/specmate-model-ecore/model/specmate.ecore
@@ -239,8 +239,8 @@
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="Operation">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//batch/OperationType"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//base/IContainer"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//base/IContainer"
+      <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//base/IContentElement"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//base/IContentElement"
           containment="true"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EEnum" name="OperationType">
diff --git a/bundles/specmate-model-ecore/model/specmate.history b/bundles/specmate-model-ecore/model/specmate.history
index 2cf9795ef..4ef4b1511 100644
--- a/bundles/specmate-model-ecore/model/specmate.history
+++ b/bundles/specmate-model-ecore/model/specmate.history
@@ -2155,5 +2155,16 @@
       <element href="specmate.ecore#//administration"/>
     </changes>
   </releases>
-  <releases xmi:id="_v9cJd3uTEei8ObzZvExuSA"/>
+  <releases xmi:id="_v9cJd3uTEei8ObzZvExuSA">
+    <changes xsi:type="history:Set" xmi:id="_xN-2sIaIEei9LfL5DaGKCA" featureName="eType">
+      <element href="specmate.ecore#//batch/Operation/value"/>
+      <referenceValue href="specmate.ecore#//base/IContentElement"/>
+      <oldReferenceValue href="specmate.ecore#//base/IContainer"/>
+    </changes>
+    <changes xsi:type="history:Set" xmi:id="_nMCbMIaJEei9LfL5DaGKCA" featureName="eType">
+      <element href="specmate.ecore#//batch/Operation/target"/>
+      <referenceValue href="specmate.ecore#//base/IContentElement"/>
+      <oldReferenceValue href="specmate.ecore#//base/IContainer"/>
+    </changes>
+  </releases>
 </history:History>
diff --git a/bundles/specmate-model-gen/src/com/specmate/model/batch/Operation.java b/bundles/specmate-model-gen/src/com/specmate/model/batch/Operation.java
index 6208e01be..5b3246a25 100644
--- a/bundles/specmate-model-gen/src/com/specmate/model/batch/Operation.java
+++ b/bundles/specmate-model-gen/src/com/specmate/model/batch/Operation.java
@@ -2,8 +2,7 @@
  */
 package com.specmate.model.batch;
 
-import com.specmate.model.base.IContainer;
-
+import com.specmate.model.base.IContentElement;
 import org.eclipse.emf.cdo.CDOObject;
 
 /**
@@ -64,12 +63,12 @@ public interface Operation extends CDOObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Target</em>' reference.
-	 * @see #setTarget(IContainer)
+	 * @see #setTarget(IContentElement)
 	 * @see com.specmate.model.batch.BatchPackage#getOperation_Target()
 	 * @model
 	 * @generated
 	 */
-	IContainer getTarget();
+	IContentElement getTarget();
 
 	/**
 	 * Sets the value of the '{@link com.specmate.model.batch.Operation#getTarget <em>Target</em>}' reference.
@@ -79,7 +78,7 @@ public interface Operation extends CDOObject {
 	 * @see #getTarget()
 	 * @generated
 	 */
-	void setTarget(IContainer value);
+	void setTarget(IContentElement value);
 
 	/**
 	 * Returns the value of the '<em><b>Value</b></em>' containment reference.
@@ -90,12 +89,12 @@ public interface Operation extends CDOObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value</em>' containment reference.
-	 * @see #setValue(IContainer)
+	 * @see #setValue(IContentElement)
 	 * @see com.specmate.model.batch.BatchPackage#getOperation_Value()
 	 * @model containment="true"
 	 * @generated
 	 */
-	IContainer getValue();
+	IContentElement getValue();
 
 	/**
 	 * Sets the value of the '{@link com.specmate.model.batch.Operation#getValue <em>Value</em>}' containment reference.
@@ -105,6 +104,6 @@ public interface Operation extends CDOObject {
 	 * @see #getValue()
 	 * @generated
 	 */
-	void setValue(IContainer value);
+	void setValue(IContentElement value);
 
 } // Operation
diff --git a/bundles/specmate-model-gen/src/com/specmate/model/batch/impl/BatchPackageImpl.java b/bundles/specmate-model-gen/src/com/specmate/model/batch/impl/BatchPackageImpl.java
index c2af41691..185bf54fa 100644
--- a/bundles/specmate-model-gen/src/com/specmate/model/batch/impl/BatchPackageImpl.java
+++ b/bundles/specmate-model-gen/src/com/specmate/model/batch/impl/BatchPackageImpl.java
@@ -290,8 +290,8 @@ public void initializePackageContents() {
 
 		initEClass(operationEClass, Operation.class, "Operation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getOperation_Type(), this.getOperationType(), "type", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getOperation_Target(), theBasePackage.getIContainer(), null, "target", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getOperation_Value(), theBasePackage.getIContainer(), null, "value", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getOperation_Target(), theBasePackage.getIContentElement(), null, "target", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getOperation_Value(), theBasePackage.getIContentElement(), null, "value", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		// Initialize enums and add enum literals
 		initEEnum(operationTypeEEnum, OperationType.class, "OperationType");
diff --git a/bundles/specmate-model-gen/src/com/specmate/model/batch/impl/OperationImpl.java b/bundles/specmate-model-gen/src/com/specmate/model/batch/impl/OperationImpl.java
index 838a3b887..b67392ea0 100644
--- a/bundles/specmate-model-gen/src/com/specmate/model/batch/impl/OperationImpl.java
+++ b/bundles/specmate-model-gen/src/com/specmate/model/batch/impl/OperationImpl.java
@@ -2,8 +2,7 @@
  */
 package com.specmate.model.batch.impl;
 
-import com.specmate.model.base.IContainer;
-
+import com.specmate.model.base.IContentElement;
 import com.specmate.model.batch.BatchPackage;
 import com.specmate.model.batch.Operation;
 import com.specmate.model.batch.OperationType;
@@ -93,8 +92,8 @@ public void setType(OperationType newType) {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public IContainer getTarget() {
-		return (IContainer)eDynamicGet(BatchPackage.OPERATION__TARGET, BatchPackage.Literals.OPERATION__TARGET, true, true);
+	public IContentElement getTarget() {
+		return (IContentElement)eDynamicGet(BatchPackage.OPERATION__TARGET, BatchPackage.Literals.OPERATION__TARGET, true, true);
 	}
 
 	/**
@@ -102,8 +101,8 @@ public IContainer getTarget() {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public IContainer basicGetTarget() {
-		return (IContainer)eDynamicGet(BatchPackage.OPERATION__TARGET, BatchPackage.Literals.OPERATION__TARGET, false, true);
+	public IContentElement basicGetTarget() {
+		return (IContentElement)eDynamicGet(BatchPackage.OPERATION__TARGET, BatchPackage.Literals.OPERATION__TARGET, false, true);
 	}
 
 	/**
@@ -111,7 +110,7 @@ public IContainer basicGetTarget() {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setTarget(IContainer newTarget) {
+	public void setTarget(IContentElement newTarget) {
 		eDynamicSet(BatchPackage.OPERATION__TARGET, BatchPackage.Literals.OPERATION__TARGET, newTarget);
 	}
 
@@ -120,8 +119,8 @@ public void setTarget(IContainer newTarget) {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public IContainer getValue() {
-		return (IContainer)eDynamicGet(BatchPackage.OPERATION__VALUE, BatchPackage.Literals.OPERATION__VALUE, true, true);
+	public IContentElement getValue() {
+		return (IContentElement)eDynamicGet(BatchPackage.OPERATION__VALUE, BatchPackage.Literals.OPERATION__VALUE, true, true);
 	}
 
 	/**
@@ -129,7 +128,7 @@ public IContainer getValue() {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetValue(IContainer newValue, NotificationChain msgs) {
+	public NotificationChain basicSetValue(IContentElement newValue, NotificationChain msgs) {
 		msgs = eDynamicInverseAdd((InternalEObject)newValue, BatchPackage.OPERATION__VALUE, msgs);
 		return msgs;
 	}
@@ -139,7 +138,7 @@ public NotificationChain basicSetValue(IContainer newValue, NotificationChain ms
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setValue(IContainer newValue) {
+	public void setValue(IContentElement newValue) {
 		eDynamicSet(BatchPackage.OPERATION__VALUE, BatchPackage.Literals.OPERATION__VALUE, newValue);
 	}
 
@@ -188,10 +187,10 @@ public void eSet(int featureID, Object newValue) {
 				setType((OperationType)newValue);
 				return;
 			case BatchPackage.OPERATION__TARGET:
-				setTarget((IContainer)newValue);
+				setTarget((IContentElement)newValue);
 				return;
 			case BatchPackage.OPERATION__VALUE:
-				setValue((IContainer)newValue);
+				setValue((IContentElement)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -209,10 +208,10 @@ public void eUnset(int featureID) {
 				setType(TYPE_EDEFAULT);
 				return;
 			case BatchPackage.OPERATION__TARGET:
-				setTarget((IContainer)null);
+				setTarget((IContentElement)null);
 				return;
 			case BatchPackage.OPERATION__VALUE:
-				setValue((IContainer)null);
+				setValue((IContentElement)null);
 				return;
 		}
 		super.eUnset(featureID);
diff --git a/web/src/app/model/Operation.ts b/web/src/app/model/Operation.ts
index e12642a1c..346f1ed09 100644
--- a/web/src/app/model/Operation.ts
+++ b/web/src/app/model/Operation.ts
@@ -1,7 +1,7 @@
 	import './support/gentypes';
 	import { Proxy } from './support/proxy';
 
-			import { IContainer } from './IContainer';
+			import { IContentElement } from './IContentElement';
 
 	export class Operation  {
 
@@ -19,7 +19,7 @@
 
 		// Containment
 		
-		public value: IContainer;
+		public value: IContentElement;
 
 
 	}
diff --git a/web/src/assets/scss/specmate.extensions.scss b/web/src/assets/scss/specmate.extensions.scss
index 9a5a4ddc0..a19654300 100644
--- a/web/src/assets/scss/specmate.extensions.scss
+++ b/web/src/assets/scss/specmate.extensions.scss
@@ -7,6 +7,11 @@ button,
     cursor: pointer;
 }
 
+.btn-sm,
+.form-control-sm {
+    font-size: 0.9375rem;
+}
+
 a {
     color: #007EA8;
 }