Index: cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridge.xsd
===================================================================
--- cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridge.xsd	(revision 168675)
+++ cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridge.xsd	(working copy)
@@ -25,6 +25,7 @@
     				</xs:simpleContent>
     			</xs:complexType>
     		</xs:element>
+    		<xs:element name="displayName" maxOccurs="1" minOccurs="0" />
     		<xs:element name="description" maxOccurs="1" minOccurs="0" />
     		<xs:element name="iaasProvider" maxOccurs="unbounded"
     			minOccurs="1">
@@ -113,6 +114,8 @@
     	<xs:attribute type="xs:string" name="type" />
     	<xs:attribute type="xs:string" name="host" />
     	<xs:attribute type="xs:string" name="provider" />
+    	<xs:attribute type="xs:string" name="version" />
+    	<xs:attribute type="xs:boolean" name="multiTenant" />
     </xs:complexType>
   </xs:element>
 
Index: cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridges.xsd
===================================================================
--- cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridges.xsd	(revision 168675)
+++ cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridges.xsd	(working copy)
@@ -34,6 +34,8 @@
             			</xs:simpleContent>
             		</xs:complexType>
             	</xs:element>
+            	<xs:element name="displayName" maxOccurs="1"
+            		minOccurs="0" />
             	<xs:element name="description" maxOccurs="1"
             		minOccurs="0" />
             	<xs:element name="iaasProvider" maxOccurs="unbounded"
@@ -125,6 +127,8 @@
             <xs:attribute type="xs:string" name="type"/>
             <xs:attribute type="xs:string" name="host" />
             <xs:attribute type="xs:string" name="provider" />
+            <xs:attribute type="xs:string" name="version" />
+            <xs:attribute type="xs:boolean" name="multiTenant" />
           </xs:complexType>
         </xs:element>
       </xs:choice>
Index: cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/service.xsd
===================================================================
--- cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/service.xsd	(revision 168675)
+++ cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/service.xsd	(working copy)
@@ -24,6 +24,19 @@
           		</xs:element>
           		<xs:element name="payload" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element>
           		<xs:element name="host" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element>
+          		<xs:element name="property"
+    						maxOccurs="unbounded" minOccurs="0">
+    						<xs:complexType>
+    							<xs:simpleContent>
+    								<xs:extension base="xs:string">
+    									<xs:attribute type="xs:string"
+    										name="name" />
+    									<xs:attribute type="xs:string"
+    										name="value" />
+    								</xs:extension>
+    							</xs:simpleContent>
+    						</xs:complexType>
+    					</xs:element>
           	</xs:choice>
           	<xs:attribute type="xs:string" name="domain" />
           	<xs:attribute type="xs:string" name="tenantRange" />
Index: cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/services.xsd
===================================================================
--- cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/services.xsd	(revision 168675)
+++ cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/services.xsd	(working copy)
@@ -26,6 +26,19 @@
               </xs:element>
               <xs:element name="payload" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element>
               <xs:element name="host" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element>
+              <xs:element name="property"
+    						maxOccurs="unbounded" minOccurs="0">
+    						<xs:complexType>
+    							<xs:simpleContent>
+    								<xs:extension base="xs:string">
+    									<xs:attribute type="xs:string"
+    										name="name" />
+    									<xs:attribute type="xs:string"
+    										name="value" />
+    								</xs:extension>
+    							</xs:simpleContent>
+    						</xs:complexType>
+    					</xs:element>
             </xs:choice>
             <xs:attribute type="xs:string" name="domain"/>
             <xs:attribute type="xs:string" name="subDomain"/>