diff --git a/SAS/XSD/SAS/LofarBase.xsd b/SAS/XSD/SAS/LofarBase.xsd
index a80a5a692737881632a3c10500e6e614ff2c4161..84e9656811d01951dea626db94934810511385f9 100644
--- a/SAS/XSD/SAS/LofarBase.xsd
+++ b/SAS/XSD/SAS/LofarBase.xsd
@@ -404,15 +404,19 @@
 			<xsd:element name="ignoreTarget" type="xsd:boolean"/>
 		</xsd:sequence>
 	</xsd:complexType>
+<!-- Calibration Pipeline related declarations -->
+	<xsd:complexType name="CalibrationPipeline">
+		<xsd:complexContent>
+			<xsd:extension base="AveragingPipeline"><!-- Untested if this works properly -->
+				<xsd:sequence/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
 <!-- Imaging Pipeline related declarations -->
 	<xsd:complexType name="ImagingPipeline">
 		<xsd:complexContent>
-			<xsd:extension base="Pipeline"><!-- Should maybe derive from AveragingPipeline or CalibrationPipeline-->
+			<xsd:extension base="CalibrationPipeline"><!-- Untested if this works properly -->
 				<xsd:sequence>
-					<xsd:element name="name" type="xsd:string"/>
-					<xsd:element name="description" type="xsd:string"/>
-					<xsd:element name="processingCluster" type="ProcessingCluster"/>
-					<xsd:element name="defaultTemplate" type="xsd:string"/>
 					<xsd:element minOccurs="0" name="imagerIntegrationTime" type="xsd:double"/>
 				</xsd:sequence>
 			</xsd:extension>