diff --git a/Examples/PVCollada_2.0/01 - VerySimpleFixedPVC2_without_electrical_layout.pvc2 b/Examples/PVCollada_2.0/01 - VerySimpleFixedPVC2_without_electrical_layout.pvc2
index 0a78b4e..2c75a51 100644
--- a/Examples/PVCollada_2.0/01 - VerySimpleFixedPVC2_without_electrical_layout.pvc2	
+++ b/Examples/PVCollada_2.0/01 - VerySimpleFixedPVC2_without_electrical_layout.pvc2	
@@ -157,7 +157,7 @@
 						<pv:module_columns>7</pv:module_columns>
 						<pv:module_orientation>landscape</pv:module_orientation>
 						<pv:tilt>23.50</pv:tilt>
-						<pv:azimuth>0</pv:azimuth>
+						<pv:azimuth>180</pv:azimuth>
 						<pv:module_id>ModuleModel1</pv:module_id>
 					</pv:rack>
 				</technique>
diff --git a/Examples/PVCollada_2.0/02 - TrackersPVC2_without_electrical_layout.pvc2 b/Examples/PVCollada_2.0/02 - TrackersPVC2_without_electrical_layout.pvc2
index 6b3c772..2489bd5 100644
--- a/Examples/PVCollada_2.0/02 - TrackersPVC2_without_electrical_layout.pvc2	
+++ b/Examples/PVCollada_2.0/02 - TrackersPVC2_without_electrical_layout.pvc2	
@@ -158,7 +158,7 @@
 						<pv:module_rows>2</pv:module_rows>
 						<pv:module_columns>15</pv:module_columns>
 						<pv:module_orientation>portrait</pv:module_orientation>
-						<pv:tracker_azimuth>0</pv:tracker_azimuth>
+						<pv:tracker_azimuth>180</pv:tracker_azimuth>
 						<pv:tracker_slope>0</pv:tracker_slope>
 						<pv:module_id>ModuleModel1</pv:module_id>
 					</pv:rack>
diff --git a/Examples/PVCollada_2.0/03 - VerySimpleFixedPVC2_with_basic_electrical_layout.pvc2 b/Examples/PVCollada_2.0/03 - VerySimpleFixedPVC2_with_basic_electrical_layout.pvc2
index 721380c..adc41da 100644
--- a/Examples/PVCollada_2.0/03 - VerySimpleFixedPVC2_with_basic_electrical_layout.pvc2	
+++ b/Examples/PVCollada_2.0/03 - VerySimpleFixedPVC2_with_basic_electrical_layout.pvc2	
@@ -89,26 +89,10 @@
 										<pv:module_array>
 											<!-- Cable between the string and the inverter -->
 											<pv:cable_to_parent url="#CableModel1" length="3" id="cableInstance2" />
-											<pv:module_layout url="#rackId1">
-												<pv:position_in_string>1</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1">
-												<pv:position_in_string>2</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1">
-												<pv:position_in_string>3</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1">
-												<pv:position_in_string>4</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
+											<pv:module_layout url="#rackId1" position_in_string="1" row="1" column="1" />
+											<pv:module_layout url="#rackId1" position_in_string="2" row="1" column="2" />
+											<pv:module_layout url="#rackId1" position_in_string="3" row="1" column="3" />
+											<pv:module_layout url="#rackId1" position_in_string="4" row="1" column="4" />
 										</pv:module_array>
 									</pv:string>
 								</pv:mppt>
@@ -119,26 +103,10 @@
 										<pv:module_array>
 											<!-- Cable between the string and the inverter -->
 											<pv:cable_to_parent url="#CableModel1" length="4" id="cableInstance3" />
-											<pv:module_layout url="#rackId2">
-												<pv:position_in_string>1</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2">
-												<pv:position_in_string>2</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2">
-												<pv:position_in_string>3</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2">
-												<pv:position_in_string>4</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
+											<pv:module_layout url="#rackId2" position_in_string="1" row="1" column="1" />
+											<pv:module_layout url="#rackId2" position_in_string="2" row="1" column="2" />
+											<pv:module_layout url="#rackId2" position_in_string="3" row="1" column="3" />
+											<pv:module_layout url="#rackId2" position_in_string="4" row="1" column="4" />
 										</pv:module_array>
 									</pv:string>
 								</pv:mppt>
@@ -149,26 +117,10 @@
 										<pv:module_array>
 											<!-- Cable between the string and the inverter -->
 											<pv:cable_to_parent url="#CableModel1" length="5" id="cableInstance4" />
-											<pv:module_layout url="#rackId3">
-												<pv:position_in_string>1</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3">
-												<pv:position_in_string>2</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3">
-												<pv:position_in_string>3</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3">
-												<pv:position_in_string>4</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
+											<pv:module_layout url="#rackId3" position_in_string="1" row="1" column="1" />
+											<pv:module_layout url="#rackId3" position_in_string="2" row="1" column="2" />
+											<pv:module_layout url="#rackId3" position_in_string="3" row="1" column="3" />
+											<pv:module_layout url="#rackId3" position_in_string="4" row="1" column="4" />
 										</pv:module_array>
 									</pv:string>
 								</pv:mppt>
@@ -286,7 +238,7 @@
 						<pv:module_columns>7</pv:module_columns>
 						<pv:module_orientation>landscape</pv:module_orientation>
 						<pv:tilt>23.50</pv:tilt>
-						<pv:azimuth>0</pv:azimuth>
+						<pv:azimuth>180</pv:azimuth>
 						<pv:module_id>ModuleModel1</pv:module_id>
 					</pv:rack>
 				</technique>
diff --git a/Examples/PVCollada_2.0/04 - TrackersPVC2_with_basic_electrical_layout.pvc2 b/Examples/PVCollada_2.0/04 - TrackersPVC2_with_basic_electrical_layout.pvc2
index bb715f6..7f7ba7e 100644
--- a/Examples/PVCollada_2.0/04 - TrackersPVC2_with_basic_electrical_layout.pvc2	
+++ b/Examples/PVCollada_2.0/04 - TrackersPVC2_with_basic_electrical_layout.pvc2	
@@ -88,126 +88,30 @@
 										<pv:module_array>
 											<!-- Cable between the module_array and the inverter -->
 											<pv:cable_to_parent url="#CableModel1" length="3" id="cableInstance2" />
-											<pv:module_layout url="#rackId1-1">
-												<pv:position_in_string>1</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-1">
-												<pv:position_in_string>2</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-1">
-												<pv:position_in_string>3</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-1">
-												<pv:position_in_string>4</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-1">
-												<pv:position_in_string>5</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-1">
-												<pv:position_in_string>6</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-2">
-												<pv:position_in_string>7</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-2">
-												<pv:position_in_string>8</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-2">
-												<pv:position_in_string>9</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-2">
-												<pv:position_in_string>10</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-2">
-												<pv:position_in_string>11</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-2">
-												<pv:position_in_string>12</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-3">
-												<pv:position_in_string>13</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-3">
-												<pv:position_in_string>14</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-3">
-												<pv:position_in_string>15</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-3">
-												<pv:position_in_string>16</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-3">
-												<pv:position_in_string>17</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-3">
-												<pv:position_in_string>18</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-4">
-												<pv:position_in_string>19</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-4">
-												<pv:position_in_string>20</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-4">
-												<pv:position_in_string>21</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-4">
-												<pv:position_in_string>22</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-4">
-												<pv:position_in_string>23</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-4">
-												<pv:position_in_string>24</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
+											<pv:module_layout url="#rackId1-1" position_in_string="1" row="1" column="1" />
+											<pv:module_layout url="#rackId1-1" position_in_string="2" row="1" column="2" />
+											<pv:module_layout url="#rackId1-1" position_in_string="3" row="1" column="3" />
+											<pv:module_layout url="#rackId1-1" position_in_string="4" row="1" column="4" />
+											<pv:module_layout url="#rackId1-1" position_in_string="5" row="1" column="5" />
+											<pv:module_layout url="#rackId1-1" position_in_string="6" row="1" column="6" />
+											<pv:module_layout url="#rackId1-2" position_in_string="7" row="1" column="1" />
+											<pv:module_layout url="#rackId1-2" position_in_string="8" row="1" column="2" />
+											<pv:module_layout url="#rackId1-2" position_in_string="9" row="1" column="3" />
+											<pv:module_layout url="#rackId1-2" position_in_string="10" row="1" column="4" />
+											<pv:module_layout url="#rackId1-2" position_in_string="11" row="1" column="5" />
+											<pv:module_layout url="#rackId1-2" position_in_string="12" row="1" column="6" />
+											<pv:module_layout url="#rackId1-3" position_in_string="13" row="1" column="1" />
+											<pv:module_layout url="#rackId1-3" position_in_string="14" row="1" column="2" />
+											<pv:module_layout url="#rackId1-3" position_in_string="15" row="1" column="3" />
+											<pv:module_layout url="#rackId1-3" position_in_string="16" row="1" column="4" />
+											<pv:module_layout url="#rackId1-3" position_in_string="17" row="1" column="5" />
+											<pv:module_layout url="#rackId1-3" position_in_string="18" row="1" column="6" />
+											<pv:module_layout url="#rackId1-4" position_in_string="19" row="1" column="1" />
+											<pv:module_layout url="#rackId1-4" position_in_string="20" row="1" column="2" />
+											<pv:module_layout url="#rackId1-4" position_in_string="21" row="1" column="3" />
+											<pv:module_layout url="#rackId1-4" position_in_string="22" row="1" column="4" />
+											<pv:module_layout url="#rackId1-4" position_in_string="23" row="1" column="5" />
+											<pv:module_layout url="#rackId1-4" position_in_string="24" row="1" column="6" />
 										</pv:module_array>
 									</pv:string>
 								</pv:mppt>
@@ -218,126 +122,30 @@
 										<pv:module_array>
 										<!-- Cable between the module_array and the inverter -->
 										<pv:cable_to_parent url="#CableModel1" length="3" id="cableInstance3"/>
-											<pv:module_layout url="#rackId1-1">
-												<pv:position_in_string>1</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-1">
-												<pv:position_in_string>2</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-1">
-												<pv:position_in_string>3</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-1">
-												<pv:position_in_string>4</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-1">
-												<pv:position_in_string>5</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-1">
-												<pv:position_in_string>6</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-2">
-												<pv:position_in_string>7</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-2">
-												<pv:position_in_string>8</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-2">
-												<pv:position_in_string>9</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-2">
-												<pv:position_in_string>10</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-2">
-												<pv:position_in_string>11</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-2">
-												<pv:position_in_string>12</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-3">
-												<pv:position_in_string>13</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-3">
-												<pv:position_in_string>14</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-3">
-												<pv:position_in_string>15</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-3">
-												<pv:position_in_string>16</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-3">
-												<pv:position_in_string>17</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-3">
-												<pv:position_in_string>18</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-4">
-												<pv:position_in_string>19</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-4">
-												<pv:position_in_string>20</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-4">
-												<pv:position_in_string>21</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-4">
-												<pv:position_in_string>22</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-4">
-												<pv:position_in_string>23</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId1-4">
-												<pv:position_in_string>24</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
+											<pv:module_layout url="#rackId1-1" position_in_string="1" row="2" column="1" />
+											<pv:module_layout url="#rackId1-1" position_in_string="2" row="2" column="2" />
+											<pv:module_layout url="#rackId1-1" position_in_string="3" row="2" column="3" />
+											<pv:module_layout url="#rackId1-1" position_in_string="4" row="2" column="4" />
+											<pv:module_layout url="#rackId1-1" position_in_string="5" row="2" column="5" />
+											<pv:module_layout url="#rackId1-1" position_in_string="6" row="2" column="6" />
+											<pv:module_layout url="#rackId1-2" position_in_string="7" row="2" column="1" />
+											<pv:module_layout url="#rackId1-2" position_in_string="8" row="2" column="2" />
+											<pv:module_layout url="#rackId1-2" position_in_string="9" row="2" column="3" />
+											<pv:module_layout url="#rackId1-2" position_in_string="10" row="2" column="4" />
+											<pv:module_layout url="#rackId1-2" position_in_string="11" row="2" column="5" />
+											<pv:module_layout url="#rackId1-2" position_in_string="12" row="2" column="6" />
+											<pv:module_layout url="#rackId1-3" position_in_string="13" row="2" column="1" />
+											<pv:module_layout url="#rackId1-3" position_in_string="14" row="2" column="2" />
+											<pv:module_layout url="#rackId1-3" position_in_string="15" row="2" column="3" />
+											<pv:module_layout url="#rackId1-3" position_in_string="16" row="2" column="4" />
+											<pv:module_layout url="#rackId1-3" position_in_string="17" row="2" column="5" />
+											<pv:module_layout url="#rackId1-3" position_in_string="18" row="2" column="6" />
+											<pv:module_layout url="#rackId1-4" position_in_string="19" row="2" column="1" />
+											<pv:module_layout url="#rackId1-4" position_in_string="20" row="2" column="2" />
+											<pv:module_layout url="#rackId1-4" position_in_string="21" row="2" column="3" />
+											<pv:module_layout url="#rackId1-4" position_in_string="22" row="2" column="4" />
+											<pv:module_layout url="#rackId1-4" position_in_string="23" row="2" column="5" />
+											<pv:module_layout url="#rackId1-4" position_in_string="24" row="2" column="6" />
 										</pv:module_array>
 									</pv:string>
 								</pv:mppt>
@@ -348,126 +156,30 @@
 										<pv:module_array>
 											<!-- Cable between the module_array and the inverter -->
 											<pv:cable_to_parent url="#CableModel1" length="3" id="cableInstance4"/>
-											<pv:module_layout url="#rackId2-1">
-												<pv:position_in_string>1</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-1">
-												<pv:position_in_string>2</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-1">
-												<pv:position_in_string>3</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-1">
-												<pv:position_in_string>4</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-1">
-												<pv:position_in_string>5</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-1">
-												<pv:position_in_string>6</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-2">
-												<pv:position_in_string>7</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-2">
-												<pv:position_in_string>8</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-2">
-												<pv:position_in_string>9</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-2">
-												<pv:position_in_string>10</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-2">
-												<pv:position_in_string>11</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-2">
-												<pv:position_in_string>12</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-3">
-												<pv:position_in_string>13</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-3">
-												<pv:position_in_string>14</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-3">
-												<pv:position_in_string>15</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-3">
-												<pv:position_in_string>16</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-3">
-												<pv:position_in_string>17</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-3">
-												<pv:position_in_string>18</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-4">
-												<pv:position_in_string>19</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-4">
-												<pv:position_in_string>20</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-4">
-												<pv:position_in_string>21</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-4">
-												<pv:position_in_string>22</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-4">
-												<pv:position_in_string>23</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-4">
-												<pv:position_in_string>24</pv:position_in_string>
-												<pv:row>1</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
+											<pv:module_layout url="#rackId2-1" position_in_string="1" row="1" column="1" />
+											<pv:module_layout url="#rackId2-1" position_in_string="2" row="1" column="2" />
+											<pv:module_layout url="#rackId2-1" position_in_string="3" row="1" column="3" />
+											<pv:module_layout url="#rackId2-1" position_in_string="4" row="1" column="4" />
+											<pv:module_layout url="#rackId2-1" position_in_string="5" row="1" column="5" />
+											<pv:module_layout url="#rackId2-1" position_in_string="6" row="1" column="6" />
+											<pv:module_layout url="#rackId2-2" position_in_string="7" row="1" column="1" />
+											<pv:module_layout url="#rackId2-2" position_in_string="8" row="1" column="2" />
+											<pv:module_layout url="#rackId2-2" position_in_string="9" row="1" column="3" />
+											<pv:module_layout url="#rackId2-2" position_in_string="10" row="1" column="4" />
+											<pv:module_layout url="#rackId2-2" position_in_string="11" row="1" column="5" />
+											<pv:module_layout url="#rackId2-2" position_in_string="12" row="1" column="6" />
+											<pv:module_layout url="#rackId2-3" position_in_string="13" row="1" column="1" />
+											<pv:module_layout url="#rackId2-3" position_in_string="14" row="1" column="2" />
+											<pv:module_layout url="#rackId2-3" position_in_string="15" row="1" column="3" />
+											<pv:module_layout url="#rackId2-3" position_in_string="16" row="1" column="4" />
+											<pv:module_layout url="#rackId2-3" position_in_string="17" row="1" column="5" />
+											<pv:module_layout url="#rackId2-3" position_in_string="18" row="1" column="6" />
+											<pv:module_layout url="#rackId2-4" position_in_string="19" row="1" column="1" />
+											<pv:module_layout url="#rackId2-4" position_in_string="20" row="1" column="2" />
+											<pv:module_layout url="#rackId2-4" position_in_string="21" row="1" column="3" />
+											<pv:module_layout url="#rackId2-4" position_in_string="22" row="1" column="4" />
+											<pv:module_layout url="#rackId2-4" position_in_string="23" row="1" column="5" />
+											<pv:module_layout url="#rackId2-4" position_in_string="24" row="1" column="6" />
 										</pv:module_array>
 									</pv:string>
 								</pv:mppt>
@@ -478,126 +190,30 @@
 										<pv:module_array>
 											<!-- Cable between the module_array and the inverter -->
 											<pv:cable_to_parent url="#CableModel1" length="3" id="cableInstance5"/>
-											<pv:module_layout url="#rackId2-1">
-												<pv:position_in_string>1</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-1">
-												<pv:position_in_string>2</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-1">
-												<pv:position_in_string>3</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-1">
-												<pv:position_in_string>4</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-1">
-												<pv:position_in_string>5</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-1">
-												<pv:position_in_string>6</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-2">
-												<pv:position_in_string>7</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-2">
-												<pv:position_in_string>8</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-2">
-												<pv:position_in_string>9</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-2">
-												<pv:position_in_string>10</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-2">
-												<pv:position_in_string>11</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-2">
-												<pv:position_in_string>12</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-3">
-												<pv:position_in_string>13</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-3">
-												<pv:position_in_string>14</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-3">
-												<pv:position_in_string>15</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-3">
-												<pv:position_in_string>16</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-3">
-												<pv:position_in_string>17</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-3">
-												<pv:position_in_string>18</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-4">
-												<pv:position_in_string>19</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-4">
-												<pv:position_in_string>20</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-4">
-												<pv:position_in_string>21</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-4">
-												<pv:position_in_string>22</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-4">
-												<pv:position_in_string>23</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId2-4">
-												<pv:position_in_string>24</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
+											<pv:module_layout url="#rackId2-1" position_in_string="1" row="2" column="1" />
+											<pv:module_layout url="#rackId2-1" position_in_string="2" row="2" column="2" />
+											<pv:module_layout url="#rackId2-1" position_in_string="3" row="2" column="3" />
+											<pv:module_layout url="#rackId2-1" position_in_string="4" row="2" column="4" />
+											<pv:module_layout url="#rackId2-1" position_in_string="5" row="2" column="5" />
+											<pv:module_layout url="#rackId2-1" position_in_string="6" row="2" column="6" />
+											<pv:module_layout url="#rackId2-2" position_in_string="7" row="2" column="1" />
+											<pv:module_layout url="#rackId2-2" position_in_string="8" row="2" column="2" />
+											<pv:module_layout url="#rackId2-2" position_in_string="9" row="2" column="3" />
+											<pv:module_layout url="#rackId2-2" position_in_string="10" row="2" column="4" />
+											<pv:module_layout url="#rackId2-2" position_in_string="11" row="2" column="5" />
+											<pv:module_layout url="#rackId2-2" position_in_string="12" row="2" column="6" />
+											<pv:module_layout url="#rackId2-3" position_in_string="13" row="2" column="1" />
+											<pv:module_layout url="#rackId2-3" position_in_string="14" row="2" column="2" />
+											<pv:module_layout url="#rackId2-3" position_in_string="15" row="2" column="3" />
+											<pv:module_layout url="#rackId2-3" position_in_string="16" row="2" column="4" />
+											<pv:module_layout url="#rackId2-3" position_in_string="17" row="2" column="5" />
+											<pv:module_layout url="#rackId2-3" position_in_string="18" row="2" column="6" />
+											<pv:module_layout url="#rackId2-4" position_in_string="19" row="2" column="1" />
+											<pv:module_layout url="#rackId2-4" position_in_string="20" row="2" column="2" />
+											<pv:module_layout url="#rackId2-4" position_in_string="21" row="2" column="3" />
+											<pv:module_layout url="#rackId2-4" position_in_string="22" row="2" column="4" />
+											<pv:module_layout url="#rackId2-4" position_in_string="23" row="2" column="5" />
+											<pv:module_layout url="#rackId2-4" position_in_string="24" row="2" column="6" />
 										</pv:module_array>
 									</pv:string>
 								</pv:mppt>
@@ -608,126 +224,30 @@
 										<pv:module_array>
 										<!-- Cable between the module_array and the inverter -->
 										<pv:cable_to_parent url="#CableModel1" length="3" id="cableInstance6"/>
-										<pv:module_layout url="#rackId3-1">
-											<pv:position_in_string>1</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>1</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-1">
-											<pv:position_in_string>2</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>2</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-1">
-											<pv:position_in_string>3</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>3</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-1">
-											<pv:position_in_string>4</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>4</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-1">
-											<pv:position_in_string>5</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>5</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-1">
-											<pv:position_in_string>6</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>6</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-2">
-											<pv:position_in_string>7</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>1</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-2">
-											<pv:position_in_string>8</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>2</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-2">
-											<pv:position_in_string>9</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>3</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-2">
-											<pv:position_in_string>10</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>4</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-2">
-											<pv:position_in_string>11</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>5</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-2">
-											<pv:position_in_string>12</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>6</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-3">
-											<pv:position_in_string>13</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>1</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-3">
-											<pv:position_in_string>14</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>2</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-3">
-											<pv:position_in_string>15</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>3</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-3">
-											<pv:position_in_string>16</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>4</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-3">
-											<pv:position_in_string>17</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>5</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-3">
-											<pv:position_in_string>18</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>6</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-4">
-											<pv:position_in_string>19</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>1</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-4">
-											<pv:position_in_string>20</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>2</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-4">
-											<pv:position_in_string>21</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>3</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-4">
-											<pv:position_in_string>22</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>4</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-4">
-											<pv:position_in_string>23</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>5</pv:column>
-										</pv:module_layout>
-										<pv:module_layout url="#rackId3-4">
-											<pv:position_in_string>24</pv:position_in_string>
-											<pv:row>1</pv:row>
-											<pv:column>6</pv:column>
-										</pv:module_layout>
+										<pv:module_layout url="#rackId3-1" position_in_string="1" row="1" column="1" />
+										<pv:module_layout url="#rackId3-1" position_in_string="2" row="1" column="2" />
+										<pv:module_layout url="#rackId3-1" position_in_string="3" row="1" column="3" />
+										<pv:module_layout url="#rackId3-1" position_in_string="4" row="1" column="4" />
+										<pv:module_layout url="#rackId3-1" position_in_string="5" row="1" column="5" />
+										<pv:module_layout url="#rackId3-1" position_in_string="6" row="1" column="6" />
+										<pv:module_layout url="#rackId3-2" position_in_string="7" row="1" column="1" />
+										<pv:module_layout url="#rackId3-2" position_in_string="8" row="1" column="2" />
+										<pv:module_layout url="#rackId3-2" position_in_string="9" row="1" column="3" />
+										<pv:module_layout url="#rackId3-2" position_in_string="10" row="1" column="4" />
+										<pv:module_layout url="#rackId3-2" position_in_string="11" row="1" column="5" />
+										<pv:module_layout url="#rackId3-2" position_in_string="12" row="1" column="6" />
+										<pv:module_layout url="#rackId3-3" position_in_string="13" row="1" column="1" />
+										<pv:module_layout url="#rackId3-3" position_in_string="14" row="1" column="2" />
+										<pv:module_layout url="#rackId3-3" position_in_string="15" row="1" column="3" />
+										<pv:module_layout url="#rackId3-3" position_in_string="16" row="1" column="4" />
+										<pv:module_layout url="#rackId3-3" position_in_string="17" row="1" column="5" />
+										<pv:module_layout url="#rackId3-3" position_in_string="18" row="1" column="6" />
+										<pv:module_layout url="#rackId3-4" position_in_string="19" row="1" column="1" />
+										<pv:module_layout url="#rackId3-4" position_in_string="20" row="1" column="2" />
+										<pv:module_layout url="#rackId3-4" position_in_string="21" row="1" column="3" />
+										<pv:module_layout url="#rackId3-4" position_in_string="22" row="1" column="4" />
+										<pv:module_layout url="#rackId3-4" position_in_string="23" row="1" column="5" />
+										<pv:module_layout url="#rackId3-4" position_in_string="24" row="1" column="6" />
 										</pv:module_array>
 									</pv:string>
 								</pv:mppt>
@@ -738,126 +258,30 @@
 										<pv:module_array>
 											<!-- Cable between the module_array and the inverter -->
 											<pv:cable_to_parent url="#CableModel1" length="3" id="cableInstance7"/>
-											<pv:module_layout url="#rackId3-1">
-												<pv:position_in_string>1</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-1">
-												<pv:position_in_string>2</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-1">
-												<pv:position_in_string>3</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-1">
-												<pv:position_in_string>4</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-1">
-												<pv:position_in_string>5</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-1">
-												<pv:position_in_string>6</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-2">
-												<pv:position_in_string>7</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-2">
-												<pv:position_in_string>8</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-2">
-												<pv:position_in_string>9</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-2">
-												<pv:position_in_string>10</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-2">
-												<pv:position_in_string>11</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-2">
-												<pv:position_in_string>12</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-3">
-												<pv:position_in_string>13</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-3">
-												<pv:position_in_string>14</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-3">
-												<pv:position_in_string>15</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-3">
-												<pv:position_in_string>16</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-3">
-												<pv:position_in_string>17</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-3">
-												<pv:position_in_string>18</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-4">
-												<pv:position_in_string>19</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>1</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-4">
-												<pv:position_in_string>20</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>2</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-4">
-												<pv:position_in_string>21</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>3</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-4">
-												<pv:position_in_string>22</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>4</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-4">
-												<pv:position_in_string>23</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>5</pv:column>
-											</pv:module_layout>
-											<pv:module_layout url="#rackId3-4">
-												<pv:position_in_string>24</pv:position_in_string>
-												<pv:row>2</pv:row>
-												<pv:column>6</pv:column>
-											</pv:module_layout>
+											<pv:module_layout url="#rackId3-1" position_in_string="1" row="2" column="1" />
+											<pv:module_layout url="#rackId3-1" position_in_string="2" row="2" column="2" />
+											<pv:module_layout url="#rackId3-1" position_in_string="3" row="2" column="3" />
+											<pv:module_layout url="#rackId3-1" position_in_string="4" row="2" column="4" />
+											<pv:module_layout url="#rackId3-1" position_in_string="5" row="2" column="5" />
+											<pv:module_layout url="#rackId3-1" position_in_string="6" row="2" column="6" />
+											<pv:module_layout url="#rackId3-2" position_in_string="7" row="2" column="1" />
+											<pv:module_layout url="#rackId3-2" position_in_string="8" row="2" column="2" />
+											<pv:module_layout url="#rackId3-2" position_in_string="9" row="2" column="3" />
+											<pv:module_layout url="#rackId3-2" position_in_string="10" row="2" column="4" />
+											<pv:module_layout url="#rackId3-2" position_in_string="11" row="2" column="5" />
+											<pv:module_layout url="#rackId3-2" position_in_string="12" row="2" column="6" />
+											<pv:module_layout url="#rackId3-3" position_in_string="13" row="2" column="1" />
+											<pv:module_layout url="#rackId3-3" position_in_string="14" row="2" column="2" />
+											<pv:module_layout url="#rackId3-3" position_in_string="15" row="2" column="3" />
+											<pv:module_layout url="#rackId3-3" position_in_string="16" row="2" column="4" />
+											<pv:module_layout url="#rackId3-3" position_in_string="17" row="2" column="5" />
+											<pv:module_layout url="#rackId3-3" position_in_string="18" row="2" column="6" />
+											<pv:module_layout url="#rackId3-4" position_in_string="19" row="2" column="1" />
+											<pv:module_layout url="#rackId3-4" position_in_string="20" row="2" column="2" />
+											<pv:module_layout url="#rackId3-4" position_in_string="21" row="2" column="3" />
+											<pv:module_layout url="#rackId3-4" position_in_string="22" row="2" column="4" />
+											<pv:module_layout url="#rackId3-4" position_in_string="23" row="2" column="5" />
+											<pv:module_layout url="#rackId3-4" position_in_string="24" row="2" column="6" />
 										</pv:module_array>
 									</pv:string>
 								</pv:mppt>
@@ -974,7 +398,7 @@
 						<pv:module_rows>2</pv:module_rows>
 						<pv:module_columns>15</pv:module_columns>
 						<pv:module_orientation>portrait</pv:module_orientation>
-						<pv:tracker_azimuth>0</pv:tracker_azimuth>
+						<pv:tracker_azimuth>180</pv:tracker_azimuth>
 						<pv:tracker_slope>0</pv:tracker_slope>
 						<pv:module_id>ModuleModel1</pv:module_id>
 					</pv:rack>
diff --git a/Examples/PVCollada_2.0/05 - VerySimpleFixedPVC2_with_electrical_layout.pvc2 b/Examples/PVCollada_2.0/05 - VerySimpleFixedPVC2_with_electrical_layout.pvc2
index eca5c10..efcab45 100644
--- a/Examples/PVCollada_2.0/05 - VerySimpleFixedPVC2_with_electrical_layout.pvc2	
+++ b/Examples/PVCollada_2.0/05 - VerySimpleFixedPVC2_with_electrical_layout.pvc2	
@@ -184,26 +184,10 @@
 														<pv:module_array>
 															<!-- Cable between the module_array and the inverter -->
 															<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance4" />
-															<pv:module_layout url="#rackId1">
-																<pv:position_in_string>1</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>1</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId1">
-																<pv:position_in_string>2</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>2</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId1">
-																<pv:position_in_string>3</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>3</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId1">
-																<pv:position_in_string>4</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>4</pv:column>
-															</pv:module_layout>
+															<pv:module_layout url="#rackId1" position_in_string="1" row="1" column="1" />
+															<pv:module_layout url="#rackId1" position_in_string="2" row="1" column="2" />
+															<pv:module_layout url="#rackId1" position_in_string="3" row="1" column="3" />
+															<pv:module_layout url="#rackId1" position_in_string="4" row="1" column="4" />
 														</pv:module_array>
 													</pv:string>
 												</pv:mppt>
@@ -222,26 +206,10 @@
 														<pv:module_array>
 															<!-- Cable between the module_array and the inverter -->
 															<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance10" />
-															<pv:module_layout url="#rackId2">
-																<pv:position_in_string>1</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>1</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId2">
-																<pv:position_in_string>2</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>2</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId2">
-																<pv:position_in_string>3</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>3</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId2">
-																<pv:position_in_string>4</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>4</pv:column>
-															</pv:module_layout>
+															<pv:module_layout url="#rackId2" position_in_string="1" row="1" column="1" />
+															<pv:module_layout url="#rackId2" position_in_string="2" row="1" column="2" />
+															<pv:module_layout url="#rackId2" position_in_string="3" row="1" column="3" />
+															<pv:module_layout url="#rackId2" position_in_string="4" row="1" column="4" />
 														</pv:module_array>
 													</pv:string>
 												</pv:mppt>
@@ -260,26 +228,10 @@
 														<pv:module_array>
 															<!-- Cable between the module_array and the inverter -->
 															<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance16" />
-															<pv:module_layout url="#rackId3">
-																<pv:position_in_string>1</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>1</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId3">
-																<pv:position_in_string>2</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>2</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId3">
-																<pv:position_in_string>3</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>3</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId3">
-																<pv:position_in_string>4</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>4</pv:column>
-															</pv:module_layout>
+															<pv:module_layout url="#rackId3" position_in_string="1" row="1" column="1" />
+															<pv:module_layout url="#rackId3" position_in_string="2" row="1" column="2" />
+															<pv:module_layout url="#rackId3" position_in_string="3" row="1" column="3" />
+															<pv:module_layout url="#rackId3" position_in_string="4" row="1" column="4" />
 														</pv:module_array>
 													</pv:string>
 												</pv:mppt>
@@ -401,7 +353,7 @@
 						<pv:module_columns>7</pv:module_columns>
 						<pv:module_orientation>landscape</pv:module_orientation>
 						<pv:tilt>23.50</pv:tilt>
-						<pv:azimuth>0</pv:azimuth>
+						<pv:azimuth>180</pv:azimuth>
 						<pv:module_id>ModuleModel1</pv:module_id>
 					</pv:rack>
 				</technique>
diff --git a/Examples/PVCollada_2.0/extensions/pvsyst/01 - PVsyst-extensions-from-PVsyst-database.pvc2 b/Examples/PVCollada_2.0/extensions/pvsyst/01 - PVsyst-extensions-from-PVsyst-database.pvc2
index 4e9f75e..b393145 100644
--- a/Examples/PVCollada_2.0/extensions/pvsyst/01 - PVsyst-extensions-from-PVsyst-database.pvc2	
+++ b/Examples/PVCollada_2.0/extensions/pvsyst/01 - PVsyst-extensions-from-PVsyst-database.pvc2	
@@ -330,137 +330,41 @@
 												<pv:cable_to_parent url="#DCCableModel1" length="5" id="cableInstance2"/>
 												<pv:cable_to_neighbor url="#DCCableModel1" length="5" id="cableInstance3"/>
 												<pv:inputs>
-													<pv:module_layout url="#rackId1">
-														<pv:position_in_string>1</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>1</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId1">
-														<pv:position_in_string>2</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>2</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId1">
-														<pv:position_in_string>3</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>3</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId1">
-														<pv:position_in_string>4</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>4</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId2">
-														<pv:position_in_string>1</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>1</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId2">
-														<pv:position_in_string>2</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>2</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId2">
-														<pv:position_in_string>3</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>3</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId2">
-														<pv:position_in_string>4</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>4</pv:column>
-													</pv:module_layout>
+													<pv:module_layout url="#rackId1" position_in_string="1" row="1" column="1" />
+													<pv:module_layout url="#rackId1" position_in_string="2" row="1" column="2" />
+													<pv:module_layout url="#rackId1" position_in_string="3" row="1" column="3" />
+													<pv:module_layout url="#rackId1" position_in_string="4" row="1" column="4" />
+													<pv:module_layout url="#rackId2" position_in_string="1" row="1" column="1" />
+													<pv:module_layout url="#rackId2" position_in_string="2" row="1" column="2" />
+													<pv:module_layout url="#rackId2" position_in_string="3" row="1" column="3" />
+													<pv:module_layout url="#rackId2" position_in_string="4" row="1" column="4" />
 												</pv:inputs>
 											</pv:instance_optimizer>
 											<pv:instance_optimizer url="#OptimizerModel1" id="InstanceOptimizer2" name="Instance Optimizer #2">
 												<pv:cable_to_neighbor url="#DCCableModel1" length="5" id="cableInstance11"/>
 												<pv:cable_to_neighbor url="#DCCableModel1" length="5" id="cableInstance12"/>
 												<pv:inputs>
-													<pv:module_layout url="#rackId3">
-														<pv:position_in_string>1</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>1</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId3">
-														<pv:position_in_string>2</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>2</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId3">
-														<pv:position_in_string>3</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>3</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId3">
-														<pv:position_in_string>4</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>4</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId4">
-														<pv:position_in_string>1</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>1</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId4">
-														<pv:position_in_string>2</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>2</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId4">
-														<pv:position_in_string>3</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>3</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId4">
-														<pv:position_in_string>4</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>4</pv:column>
-													</pv:module_layout>
+													<pv:module_layout url="#rackId3" position_in_string="1" row="1" column="1" />
+													<pv:module_layout url="#rackId3" position_in_string="2" row="1" column="2" />
+													<pv:module_layout url="#rackId3" position_in_string="3" row="1" column="3" />
+													<pv:module_layout url="#rackId3" position_in_string="4" row="1" column="4" />
+													<pv:module_layout url="#rackId4" position_in_string="1" row="1" column="1" />
+													<pv:module_layout url="#rackId4" position_in_string="2" row="1" column="2" />
+													<pv:module_layout url="#rackId4" position_in_string="3" row="1" column="3" />
+													<pv:module_layout url="#rackId4" position_in_string="4" row="1" column="4" />
 												</pv:inputs>
 											</pv:instance_optimizer>
 											<pv:instance_optimizer url="#OptimizerModel1" id="InstanceOptimizer3">
 												<pv:cable_to_neighbor url="#DCCableModel1" length="5" id="cableInstance20"/>
 												<pv:inputs>
-													<pv:module_layout url="#rackId5">
-														<pv:position_in_string>1</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>1</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId5">
-														<pv:position_in_string>2</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>2</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId5">
-														<pv:position_in_string>3</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>3</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId5">
-														<pv:position_in_string>4</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>4</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId6">
-														<pv:position_in_string>1</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>1</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId6">
-														<pv:position_in_string>2</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>2</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId6">
-														<pv:position_in_string>3</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>3</pv:column>
-													</pv:module_layout>
-													<pv:module_layout url="#rackId6">
-														<pv:position_in_string>4</pv:position_in_string>
-														<pv:row>1</pv:row>
-														<pv:column>4</pv:column>
-													</pv:module_layout>
+													<pv:module_layout url="#rackId5" position_in_string="1" row="1" column="1" />
+													<pv:module_layout url="#rackId5" position_in_string="2" row="1" column="2" />
+													<pv:module_layout url="#rackId5" position_in_string="3" row="1" column="3" />
+													<pv:module_layout url="#rackId5" position_in_string="4" row="1" column="4" />
+													<pv:module_layout url="#rackId6" position_in_string="1" row="1" column="1" />
+													<pv:module_layout url="#rackId6" position_in_string="2" row="1" column="2" />
+													<pv:module_layout url="#rackId6" position_in_string="3" row="1" column="3" />
+													<pv:module_layout url="#rackId6" position_in_string="4" row="1" column="4" />
 												</pv:inputs>
 											</pv:instance_optimizer>
 										</pv:optimizer_array>
@@ -602,7 +506,7 @@
 						<pv:module_columns>4</pv:module_columns>
 						<pv:module_orientation>portrait</pv:module_orientation>
 						<pv:tilt>21.8</pv:tilt>
-						<pv:azimuth>0</pv:azimuth>
+						<pv:azimuth>180</pv:azimuth>
 						<pv:slope>0</pv:slope>
 						<pv:module_id>ModuleModel1</pv:module_id>
 					</pv:rack>
diff --git a/Examples/PVCollada_2.0/extensions/pvsyst/02 - PVsyst-extensions-from-cdata.pvc2 b/Examples/PVCollada_2.0/extensions/pvsyst/02 - PVsyst-extensions-from-cdata.pvc2
index cefdd8e..e8a8a3e 100644
--- a/Examples/PVCollada_2.0/extensions/pvsyst/02 - PVsyst-extensions-from-cdata.pvc2	
+++ b/Examples/PVCollada_2.0/extensions/pvsyst/02 - PVsyst-extensions-from-cdata.pvc2	
@@ -327,26 +327,10 @@
 														<pv:module_array>
 															<!-- Cable between the module_array and the inverter -->
 															<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance4" />
-															<pv:module_layout url="#rackId1">
-																<pv:position_in_string>1</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>1</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId1">
-																<pv:position_in_string>2</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>2</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId1">
-																<pv:position_in_string>3</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>3</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId1">
-																<pv:position_in_string>4</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>4</pv:column>
-															</pv:module_layout>
+															<pv:module_layout url="#rackId1" position_in_string="1" row="1" column="1" />
+															<pv:module_layout url="#rackId1" position_in_string="2" row="1" column="2" />
+															<pv:module_layout url="#rackId1" position_in_string="3" row="1" column="3" />
+															<pv:module_layout url="#rackId1" position_in_string="4" row="1" column="4" />
 														</pv:module_array>
 													</pv:string>
 												</pv:mppt>
@@ -365,26 +349,10 @@
 														<pv:module_array>
 															<!-- Cable between the module_array and the inverter -->
 															<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance10" />
-															<pv:module_layout url="#rackId2">
-																<pv:position_in_string>1</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>1</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId2">
-																<pv:position_in_string>2</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>2</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId2">
-																<pv:position_in_string>3</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>3</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId2">
-																<pv:position_in_string>4</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>4</pv:column>
-															</pv:module_layout>
+															<pv:module_layout url="#rackId2" position_in_string="1" row="1" column="1" />
+															<pv:module_layout url="#rackId2" position_in_string="2" row="1" column="2" />
+															<pv:module_layout url="#rackId2" position_in_string="3" row="1" column="3" />
+															<pv:module_layout url="#rackId2" position_in_string="4" row="1" column="4" />
 														</pv:module_array>
 													</pv:string>
 												</pv:mppt>
@@ -403,26 +371,10 @@
 														<pv:module_array>
 															<!-- Cable between the module_array and the inverter -->
 															<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance16" />
-															<pv:module_layout url="#rackId3">
-																<pv:position_in_string>1</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>1</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId3">
-																<pv:position_in_string>2</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>2</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId3">
-																<pv:position_in_string>3</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>3</pv:column>
-															</pv:module_layout>
-															<pv:module_layout url="#rackId3">
-																<pv:position_in_string>4</pv:position_in_string>
-																<pv:row>1</pv:row>
-																<pv:column>4</pv:column>
-															</pv:module_layout>
+															<pv:module_layout url="#rackId3" position_in_string="1" row="1" column="1" />
+															<pv:module_layout url="#rackId3" position_in_string="2" row="1" column="2" />
+															<pv:module_layout url="#rackId3" position_in_string="3" row="1" column="3" />
+															<pv:module_layout url="#rackId3" position_in_string="4" row="1" column="4" />
 														</pv:module_array>
 													</pv:string>
 												</pv:mppt>
@@ -709,7 +661,7 @@ End of PVObject pvGInverter
 						<pv:module_columns>4</pv:module_columns>
 						<pv:module_orientation>portrait</pv:module_orientation>
 						<pv:tilt>21.8</pv:tilt>
-						<pv:azimuth>0</pv:azimuth>
+						<pv:azimuth>180</pv:azimuth>
 						<pv:slope>0</pv:slope>
 						<pv:module_id>ModuleModel1</pv:module_id>
 					</pv:rack>
diff --git a/schema/PVCollada_2.0/pvcollada_schema_2.0.xsd b/schema/PVCollada_2.0/pvcollada_schema_2.0.xsd
index 0089f3d..7a8a5b3 100644
--- a/schema/PVCollada_2.0/pvcollada_schema_2.0.xsd
+++ b/schema/PVCollada_2.0/pvcollada_schema_2.0.xsd
@@ -537,7 +537,7 @@ xmlns:collada="http://www.collada.org/2008/03/COLLADASchema">
       <xs:element name="circuit_root" type="circuit_root_type" />
     </xs:sequence>
   </xs:complexType>
-  <!-- circuit_root must have exactly one input -->
+  <!-- circuit_root can have one or multiple inputs of the same type -->
   <xs:complexType name="circuit_root_type">
     <xs:sequence>
       <xs:element name="connected_to" type="xs:string" minOccurs="0">
@@ -546,9 +546,16 @@ xmlns:collada="http://www.collada.org/2008/03/COLLADASchema">
         </xs:annotation>
       </xs:element>
       <xs:choice>
-        <xs:element name="instance_transformer" type="instance_transformer_type" />
-        <xs:element name="instance_combiner_ac" type="instance_combiner_ac_type" />
-        <xs:element name="instance_inverter" type="instance_inverter_type" />
+        <!-- Allow one or more of the same type, but not a mix -->
+        <xs:sequence>
+          <xs:element name="instance_transformer" type="instance_transformer_type" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:sequence>
+          <xs:element name="instance_combiner_ac" type="instance_combiner_ac_type" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:sequence>
+          <xs:element name="instance_inverter" type="instance_inverter_type" maxOccurs="unbounded"/>
+        </xs:sequence>
       </xs:choice>
     </xs:sequence>
   </xs:complexType>
@@ -688,14 +695,12 @@ xmlns:collada="http://www.collada.org/2008/03/COLLADASchema">
   </xs:complexType>
   <!-- module_layout: must describe position (row, column) and position in string -->
   <xs:complexType name="module_layout_type">
-    <xs:sequence>
-      <xs:element name="position_in_string" type="xs:integer" />
-      <xs:element name="row" type="xs:integer" />
-      <xs:element name="column" type="xs:integer" />
-    </xs:sequence>
+    <xs:attribute name="position_in_string" type="xs:integer" use="required" />
+    <xs:attribute name="row" type="xs:integer" use="required" />
+    <xs:attribute name="column" type="xs:integer" use="required" />
     <xs:attribute name="url" type="xs:string" use="required" />
   </xs:complexType>
-	<!-- asset objects -->
+  <!-- asset objects -->
   <xs:element name="software">
     <xs:annotation>
       <xs:documentation>This tag should only appear in the extra/technique section of the Collada/asset tag.</xs:documentation>