diff --git a/NeuroML2/ConnectionsTest.net.nml b/NeuroML2/ConnectionsTest.net.nml
index beace0b..6f54316 100644
--- a/NeuroML2/ConnectionsTest.net.nml
+++ b/NeuroML2/ConnectionsTest.net.nml
@@ -1,9 +1,9 @@
-<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd" id="ConnectionsTest">
+<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="ConnectionsTest">
     <notes>
     This NeuroML 2 file has been generated from: 
-        PyNN v0.10.1
-        libNeuroML v0.5.5
-        pyNeuroML v1.1.1
+        PyNN v0.11.0
+        libNeuroML v0.6.1
+        pyNeuroML v1.3.0
     </notes>
     <IF_cond_alpha id="IF_cond_alpha_pop_pre" cm="1.0" i_offset="0.9" tau_syn_E="2.0" tau_syn_I="5.0" v_init="-65.0" tau_m="20.0" tau_refrac="5.0" v_reset="-65.0" v_rest="-65.0" v_thresh="-50.0" e_rev_E="0.0" e_rev_I="-70.0"/>
     <IF_cond_alpha id="IF_cond_alpha_pop_post" cm="1.0" i_offset="0.9" tau_syn_E="2.0" tau_syn_I="5.0" v_init="-65.0" tau_m="20.0" tau_refrac="5.0" v_reset="-65.0" v_rest="-65.0" v_thresh="-50.0" e_rev_E="0.0" e_rev_I="-70.0"/>
@@ -17,38 +17,38 @@
             <property tag="radius" value="5"/>
             <property tag="color" value="0 0.6 0"/>
             <instance id="0">
-                <location x="-32.186643403808567" y="-17.354649054736583" z="-65.493481332544846"/>
+                <location x="6.55752035082775" y="-55.101608757626927" z="6.981516190191916"/>
             </instance>
             <instance id="1">
-                <location x="-67.354645297143236" y="-4.19796344220984" z="-43.49873410003169"/>
+                <location x="-2.602671684808056" y="-39.761020925957325" z="25.346195658415628"/>
             </instance>
             <instance id="2">
-                <location x="71.797570419985519" y="18.947079504991638" z="-12.907315815267673"/>
+                <location x="60.297517617959343" y="8.289307571080951" z="-0.022333347222747"/>
             </instance>
             <instance id="3">
-                <location x="-52.406762043828394" y="6.010609135001554" z="-58.236579579123649"/>
+                <location x="2.613828069929669" y="-45.796432341605083" z="86.733836100834182"/>
             </instance>
             <instance id="4">
-                <location x="-84.522276311302463" y="-27.093766860654476" z="-28.20137345446372"/>
+                <location x="0.531714467416378" y="87.099654948109091" z="-17.361254599683317"/>
             </instance>
         </population>
         <population id="pop_post" component="IF_cond_alpha_pop_post" size="5" type="populationList">
             <property tag="radius" value="5"/>
             <property tag="color" value="0 0.2 0.6"/>
             <instance id="0">
-                <location x="-10.963933858486152" y="160.214056107236161" z="-17.681929175932854"/>
+                <location x="46.07768717786891" y="147.596039699497055" z="33.789897869097828"/>
             </instance>
             <instance id="1">
-                <location x="-65.391507421071694" y="215.929509183693398" z="53.214475027961086"/>
+                <location x="67.156651487943805" y="137.770407334287484" z="-11.385096396535133"/>
             </instance>
             <instance id="2">
-                <location x="-25.558099064460361" y="219.63712563909769" z="-87.608059485643892"/>
+                <location x="-17.731870485797629" y="265.87748299576765" z="70.934700271910245"/>
             </instance>
             <instance id="3">
-                <location x="57.458557554047054" y="140.98406076648115" z="-24.288796136764446"/>
+                <location x="11.966381064465414" y="158.128789481071806" z="-37.737564964573721"/>
             </instance>
             <instance id="4">
-                <location x="78.618467098550227" y="180.149183458113185" z="-55.213241499240318"/>
+                <location x="74.331123762886449" y="241.146127877417939" z="50.500458145559037"/>
             </instance>
         </population>
         <projection id="pop_pre__TO__pop_post" presynapticPopulation="pop_pre" postsynapticPopulation="pop_post" synapse="syn__pop_pre__TO__pop_post">
diff --git a/NeuroML2/Inputs.net.nml b/NeuroML2/Inputs.net.nml
index f11b66c..669d643 100644
--- a/NeuroML2/Inputs.net.nml
+++ b/NeuroML2/Inputs.net.nml
@@ -1,9 +1,9 @@
-<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd" id="Inputs">
+<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="Inputs">
     <notes>
     This NeuroML 2 file has been generated from: 
-        PyNN v0.10.1
-        libNeuroML v0.5.5
-        pyNeuroML v1.1.1
+        PyNN v0.11.0
+        libNeuroML v0.6.1
+        pyNeuroML v1.3.0
     </notes>
     <pulseGenerator id="DCSource_DCSource_0" delay="50.0ms" duration="350.0ms" amplitude="0.9nA"/>
     <compoundInput id="ACSource_ACSource_1">
diff --git a/NeuroML2/LEMS_Sim_Inputs.xml b/NeuroML2/LEMS_Sim_Inputs.xml
index eea8282..6ec17cd 100644
--- a/NeuroML2/LEMS_Sim_Inputs.xml
+++ b/NeuroML2/LEMS_Sim_Inputs.xml
@@ -1,12 +1,12 @@
 <Lems>
-    
+
     <!-- 
     This LEMS file has been generated from: 
-        PyNN v0.10.1
-        libNeuroML v0.5.5
-        pyNeuroML v1.1.1
+        PyNN v0.11.0
+        libNeuroML v0.6.1
+        pyNeuroML v1.3.0
      -->
-    
+
     <!-- Specify which component to run -->
     <Target component="Sim_Inputs"/>
 
@@ -14,33 +14,32 @@
     <Include file="Cells.xml"/>
     <Include file="Networks.xml"/>
     <Include file="Simulation.xml"/>
-    
+
     <Include file="PyNN.xml"/>
     <Include file="Inputs.net.nml"/>
-   
+
     <Simulation id="Sim_Inputs" length="500.0ms" step="0.05ms" target="Inputs" seed="12345">  <!-- Note seed: ensures same random numbers used every run -->
-        
         <Display id="pop_pre_v" title="pop_pre v" timeScale="1ms" xmin="-50.0" xmax="550.0" ymin="-70" ymax="10">
             <Line id="pop_pre v: cell 42" quantity="pop_pre/0/IF_cond_alpha_pop_pre/v" scale="1mV" color="#d54f33" timeScale="1ms"/>
             <Line id="pop_pre v: cell 43" quantity="pop_pre/1/IF_cond_alpha_pop_pre/v" scale="1mV" color="#0534e4" timeScale="1ms"/>
             <Line id="pop_pre v: cell 44" quantity="pop_pre/2/IF_cond_alpha_pop_pre/v" scale="1mV" color="#98e752" timeScale="1ms"/>
             <Line id="pop_pre v: cell 45" quantity="pop_pre/3/IF_cond_alpha_pop_pre/v" scale="1mV" color="#bca074" timeScale="1ms"/>
         </Display>
-        
+
         <OutputFile id="OF_pop_pre_v" fileName="pop_pre_v.dat">
-            <OutputColumn id="pop_pre_0_IF_cond_alpha_pop_pre_v" quantity="pop_pre/0/IF_cond_alpha_pop_pre/v"/> 
-            <OutputColumn id="pop_pre_1_IF_cond_alpha_pop_pre_v" quantity="pop_pre/1/IF_cond_alpha_pop_pre/v"/> 
-            <OutputColumn id="pop_pre_2_IF_cond_alpha_pop_pre_v" quantity="pop_pre/2/IF_cond_alpha_pop_pre/v"/> 
-            <OutputColumn id="pop_pre_3_IF_cond_alpha_pop_pre_v" quantity="pop_pre/3/IF_cond_alpha_pop_pre/v"/> 
+            <OutputColumn id="pop_pre_0_IF_cond_alpha_pop_pre_v" quantity="pop_pre/0/IF_cond_alpha_pop_pre/v"/>
+            <OutputColumn id="pop_pre_1_IF_cond_alpha_pop_pre_v" quantity="pop_pre/1/IF_cond_alpha_pop_pre/v"/>
+            <OutputColumn id="pop_pre_2_IF_cond_alpha_pop_pre_v" quantity="pop_pre/2/IF_cond_alpha_pop_pre/v"/>
+            <OutputColumn id="pop_pre_3_IF_cond_alpha_pop_pre_v" quantity="pop_pre/3/IF_cond_alpha_pop_pre/v"/>
         </OutputFile>
-        
+
         <EventOutputFile id="Spikes_file_pop_pre" fileName="pop_pre.spikes" format="TIME_ID">
-            <EventSelection id="0" select="pop_pre/0/IF_cond_alpha_pop_pre" eventPort="spike"/> 
-            <EventSelection id="1" select="pop_pre/1/IF_cond_alpha_pop_pre" eventPort="spike"/> 
-            <EventSelection id="2" select="pop_pre/2/IF_cond_alpha_pop_pre" eventPort="spike"/> 
-            <EventSelection id="3" select="pop_pre/3/IF_cond_alpha_pop_pre" eventPort="spike"/> 
+            <EventSelection id="0" select="pop_pre/0/IF_cond_alpha_pop_pre" eventPort="spike"/>
+            <EventSelection id="1" select="pop_pre/1/IF_cond_alpha_pop_pre" eventPort="spike"/>
+            <EventSelection id="2" select="pop_pre/2/IF_cond_alpha_pop_pre" eventPort="spike"/>
+            <EventSelection id="3" select="pop_pre/3/IF_cond_alpha_pop_pre" eventPort="spike"/>
         </EventOutputFile>
-        
+
     </Simulation>
 
 </Lems>
diff --git a/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml b/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml
index 9e8af0c..d3b9791 100644
--- a/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml
+++ b/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml
@@ -1,12 +1,12 @@
 <Lems>
-    
+
     <!-- 
     This LEMS file has been generated from: 
-        PyNN v0.10.1
-        libNeuroML v0.5.5
-        pyNeuroML v1.1.1
+        PyNN v0.11.0
+        libNeuroML v0.6.1
+        pyNeuroML v1.3.0
      -->
-    
+
     <!-- Specify which component to run -->
     <Target component="Sim_PyNN_NeuroML2_Export"/>
 
@@ -14,100 +14,99 @@
     <Include file="Cells.xml"/>
     <Include file="Networks.xml"/>
     <Include file="Simulation.xml"/>
-    
+
     <Include file="PyNN.xml"/>
     <Include file="PyNN_NeuroML2_Export.net.nml"/>
-   
+
     <Simulation id="Sim_PyNN_NeuroML2_Export" length="500.0ms" step="0.005ms" target="PyNN_NeuroML2_Export" seed="12345">  <!-- Note seed: ensures same random numbers used every run -->
-        
         <Display id="pop_IF_curr_alpha_v" title="pop_IF_curr_alpha v" timeScale="1ms" xmin="-50.0" xmax="550.0" ymin="-70" ymax="10">
             <Line id="pop_IF_curr_alpha v: cell 42" quantity="pop_IF_curr_alpha/0/IF_curr_alpha_pop_IF_curr_alpha/v" scale="1mV" color="#d54f33" timeScale="1ms"/>
             <Line id="pop_IF_curr_alpha v: cell 43" quantity="pop_IF_curr_alpha/1/IF_curr_alpha_pop_IF_curr_alpha/v" scale="1mV" color="#0534e4" timeScale="1ms"/>
             <Line id="pop_IF_curr_alpha v: cell 44" quantity="pop_IF_curr_alpha/2/IF_curr_alpha_pop_IF_curr_alpha/v" scale="1mV" color="#98e752" timeScale="1ms"/>
         </Display>
-        
+
         <Display id="pop_IF_curr_exp_v" title="pop_IF_curr_exp v" timeScale="1ms" xmin="-50.0" xmax="550.0" ymin="-70" ymax="10">
             <Line id="pop_IF_curr_exp v: cell 45" quantity="pop_IF_curr_exp/0/IF_curr_exp_pop_IF_curr_exp/v" scale="1mV" color="#bca074" timeScale="1ms"/>
         </Display>
-        
+
         <Display id="pop_IF_cond_alpha_v" title="pop_IF_cond_alpha v" timeScale="1ms" xmin="-50.0" xmax="550.0" ymin="-70" ymax="10">
             <Line id="pop_IF_cond_alpha v: cell 46" quantity="pop_IF_cond_alpha/0/IF_cond_alpha_pop_IF_cond_alpha/v" scale="1mV" color="#632794" timeScale="1ms"/>
         </Display>
-        
+
         <Display id="pop_IF_cond_exp_v" title="pop_IF_cond_exp v" timeScale="1ms" xmin="-50.0" xmax="550.0" ymin="-70" ymax="10">
             <Line id="pop_IF_cond_exp v: cell 48" quantity="pop_IF_cond_exp/1/IF_cond_exp_pop_IF_cond_exp/v" scale="1mV" color="#8a5d88" timeScale="1ms"/>
             <Line id="pop_IF_cond_exp v: cell 49" quantity="pop_IF_cond_exp/2/IF_cond_exp_pop_IF_cond_exp/v" scale="1mV" color="#df5954" timeScale="1ms"/>
             <Line id="pop_IF_cond_exp v: cell 47" quantity="pop_IF_cond_exp/0/IF_cond_exp_pop_IF_cond_exp/v" scale="1mV" color="#52c8bf" timeScale="1ms"/>
         </Display>
-        
+
         <Display id="pop_EIF_cond_exp_isfa_ista_v" title="pop_EIF_cond_exp_isfa_ista v" timeScale="1ms" xmin="-50.0" xmax="550.0" ymin="-70" ymax="10">
             <Line id="pop_EIF_cond_exp_isfa_ista v: cell 50" quantity="pop_EIF_cond_exp_isfa_ista/0/EIF_cond_exp_isfa_ista_pop_EIF_cond_exp_isfa_ista/v" scale="1mV" color="#bf0239" timeScale="1ms"/>
         </Display>
-        
+
         <Display id="pop_HH_cond_exp_v" title="pop_HH_cond_exp v" timeScale="1ms" xmin="-50.0" xmax="550.0" ymin="-70" ymax="10">
             <Line id="pop_HH_cond_exp v: cell 51" quantity="pop_HH_cond_exp/0/HH_cond_exp_pop_HH_cond_exp/v" scale="1mV" color="#3f9fe8" timeScale="1ms"/>
         </Display>
-        
+
         <Display id="pop_post1_v" title="pop_post1 v" timeScale="1ms" xmin="-50.0" xmax="550.0" ymin="-70" ymax="10">
             <Line id="pop_post1 v: cell 52" quantity="pop_post1/0/IF_cond_exp_pop_post1/v" scale="1mV" color="#dda9d2" timeScale="1ms"/>
         </Display>
-        
+
         <Display id="pop_post2_v" title="pop_post2 v" timeScale="1ms" xmin="-50.0" xmax="550.0" ymin="-70" ymax="10">
             <Line id="pop_post2 v: cell 53" quantity="pop_post2/0/IF_cond_alpha_pop_post2/v" scale="1mV" color="#85ad96" timeScale="1ms"/>
         </Display>
-        
+
         <OutputFile id="OF_pop_IF_curr_alpha_v" fileName="pop_IF_curr_alpha_v.dat">
-            <OutputColumn id="pop_IF_curr_alpha_0_IF_curr_alpha_pop_IF_curr_alpha_v" quantity="pop_IF_curr_alpha/0/IF_curr_alpha_pop_IF_curr_alpha/v"/> 
-            <OutputColumn id="pop_IF_curr_alpha_1_IF_curr_alpha_pop_IF_curr_alpha_v" quantity="pop_IF_curr_alpha/1/IF_curr_alpha_pop_IF_curr_alpha/v"/> 
-            <OutputColumn id="pop_IF_curr_alpha_2_IF_curr_alpha_pop_IF_curr_alpha_v" quantity="pop_IF_curr_alpha/2/IF_curr_alpha_pop_IF_curr_alpha/v"/> 
+            <OutputColumn id="pop_IF_curr_alpha_0_IF_curr_alpha_pop_IF_curr_alpha_v" quantity="pop_IF_curr_alpha/0/IF_curr_alpha_pop_IF_curr_alpha/v"/>
+            <OutputColumn id="pop_IF_curr_alpha_1_IF_curr_alpha_pop_IF_curr_alpha_v" quantity="pop_IF_curr_alpha/1/IF_curr_alpha_pop_IF_curr_alpha/v"/>
+            <OutputColumn id="pop_IF_curr_alpha_2_IF_curr_alpha_pop_IF_curr_alpha_v" quantity="pop_IF_curr_alpha/2/IF_curr_alpha_pop_IF_curr_alpha/v"/>
         </OutputFile>
-        
+
         <OutputFile id="OF_pop_IF_curr_exp_v" fileName="pop_IF_curr_exp_v.dat">
-            <OutputColumn id="pop_IF_curr_exp_0_IF_curr_exp_pop_IF_curr_exp_v" quantity="pop_IF_curr_exp/0/IF_curr_exp_pop_IF_curr_exp/v"/> 
+            <OutputColumn id="pop_IF_curr_exp_0_IF_curr_exp_pop_IF_curr_exp_v" quantity="pop_IF_curr_exp/0/IF_curr_exp_pop_IF_curr_exp/v"/>
         </OutputFile>
-        
+
         <OutputFile id="OF_pop_IF_cond_alpha_v" fileName="pop_IF_cond_alpha_v.dat">
-            <OutputColumn id="pop_IF_cond_alpha_0_IF_cond_alpha_pop_IF_cond_alpha_v" quantity="pop_IF_cond_alpha/0/IF_cond_alpha_pop_IF_cond_alpha/v"/> 
+            <OutputColumn id="pop_IF_cond_alpha_0_IF_cond_alpha_pop_IF_cond_alpha_v" quantity="pop_IF_cond_alpha/0/IF_cond_alpha_pop_IF_cond_alpha/v"/>
         </OutputFile>
-        
+
         <OutputFile id="OF_pop_IF_cond_exp_v" fileName="pop_IF_cond_exp_v.dat">
-            <OutputColumn id="pop_IF_cond_exp_1_IF_cond_exp_pop_IF_cond_exp_v" quantity="pop_IF_cond_exp/1/IF_cond_exp_pop_IF_cond_exp/v"/> 
-            <OutputColumn id="pop_IF_cond_exp_2_IF_cond_exp_pop_IF_cond_exp_v" quantity="pop_IF_cond_exp/2/IF_cond_exp_pop_IF_cond_exp/v"/> 
-            <OutputColumn id="pop_IF_cond_exp_0_IF_cond_exp_pop_IF_cond_exp_v" quantity="pop_IF_cond_exp/0/IF_cond_exp_pop_IF_cond_exp/v"/> 
+            <OutputColumn id="pop_IF_cond_exp_1_IF_cond_exp_pop_IF_cond_exp_v" quantity="pop_IF_cond_exp/1/IF_cond_exp_pop_IF_cond_exp/v"/>
+            <OutputColumn id="pop_IF_cond_exp_2_IF_cond_exp_pop_IF_cond_exp_v" quantity="pop_IF_cond_exp/2/IF_cond_exp_pop_IF_cond_exp/v"/>
+            <OutputColumn id="pop_IF_cond_exp_0_IF_cond_exp_pop_IF_cond_exp_v" quantity="pop_IF_cond_exp/0/IF_cond_exp_pop_IF_cond_exp/v"/>
         </OutputFile>
-        
+
         <OutputFile id="OF_pop_EIF_cond_exp_isfa_ista_v" fileName="pop_EIF_cond_exp_isfa_ista_v.dat">
-            <OutputColumn id="pop_EIF_cond_exp_isfa_ista_0_EIF_cond_exp_isfa_ista_pop_EIF_cond_exp_isfa_ista_v" quantity="pop_EIF_cond_exp_isfa_ista/0/EIF_cond_exp_isfa_ista_pop_EIF_cond_exp_isfa_ista/v"/> 
+            <OutputColumn id="pop_EIF_cond_exp_isfa_ista_0_EIF_cond_exp_isfa_ista_pop_EIF_cond_exp_isfa_ista_v" quantity="pop_EIF_cond_exp_isfa_ista/0/EIF_cond_exp_isfa_ista_pop_EIF_cond_exp_isfa_ista/v"/>
         </OutputFile>
-        
+
         <OutputFile id="OF_pop_HH_cond_exp_v" fileName="pop_HH_cond_exp_v.dat">
-            <OutputColumn id="pop_HH_cond_exp_0_HH_cond_exp_pop_HH_cond_exp_v" quantity="pop_HH_cond_exp/0/HH_cond_exp_pop_HH_cond_exp/v"/> 
+            <OutputColumn id="pop_HH_cond_exp_0_HH_cond_exp_pop_HH_cond_exp_v" quantity="pop_HH_cond_exp/0/HH_cond_exp_pop_HH_cond_exp/v"/>
         </OutputFile>
-        
+
         <OutputFile id="OF_pop_post1_v" fileName="pop_post1_v.dat">
-            <OutputColumn id="pop_post1_0_IF_cond_exp_pop_post1_v" quantity="pop_post1/0/IF_cond_exp_pop_post1/v"/> 
+            <OutputColumn id="pop_post1_0_IF_cond_exp_pop_post1_v" quantity="pop_post1/0/IF_cond_exp_pop_post1/v"/>
         </OutputFile>
-        
+
         <OutputFile id="OF_pop_post2_v" fileName="pop_post2_v.dat">
-            <OutputColumn id="pop_post2_0_IF_cond_alpha_pop_post2_v" quantity="pop_post2/0/IF_cond_alpha_pop_post2/v"/> 
+            <OutputColumn id="pop_post2_0_IF_cond_alpha_pop_post2_v" quantity="pop_post2/0/IF_cond_alpha_pop_post2/v"/>
         </OutputFile>
-        
+
         <EventOutputFile id="Spikes_file_pop_IF_curr_alpha" fileName="pop_IF_curr_alpha.spikes" format="TIME_ID">
-            <EventSelection id="0" select="pop_IF_curr_alpha/0/IF_curr_alpha_pop_IF_curr_alpha" eventPort="spike"/> 
-            <EventSelection id="1" select="pop_IF_curr_alpha/1/IF_curr_alpha_pop_IF_curr_alpha" eventPort="spike"/> 
-            <EventSelection id="2" select="pop_IF_curr_alpha/2/IF_curr_alpha_pop_IF_curr_alpha" eventPort="spike"/> 
+            <EventSelection id="0" select="pop_IF_curr_alpha/0/IF_curr_alpha_pop_IF_curr_alpha" eventPort="spike"/>
+            <EventSelection id="1" select="pop_IF_curr_alpha/1/IF_curr_alpha_pop_IF_curr_alpha" eventPort="spike"/>
+            <EventSelection id="2" select="pop_IF_curr_alpha/2/IF_curr_alpha_pop_IF_curr_alpha" eventPort="spike"/>
         </EventOutputFile>
-        
+
         <EventOutputFile id="Spikes_file_pop_IF_cond_exp" fileName="pop_IF_cond_exp.spikes" format="TIME_ID">
-            <EventSelection id="1" select="pop_IF_cond_exp/1/IF_cond_exp_pop_IF_cond_exp" eventPort="spike"/> 
-            <EventSelection id="2" select="pop_IF_cond_exp/2/IF_cond_exp_pop_IF_cond_exp" eventPort="spike"/> 
-            <EventSelection id="0" select="pop_IF_cond_exp/0/IF_cond_exp_pop_IF_cond_exp" eventPort="spike"/> 
+            <EventSelection id="1" select="pop_IF_cond_exp/1/IF_cond_exp_pop_IF_cond_exp" eventPort="spike"/>
+            <EventSelection id="2" select="pop_IF_cond_exp/2/IF_cond_exp_pop_IF_cond_exp" eventPort="spike"/>
+            <EventSelection id="0" select="pop_IF_cond_exp/0/IF_cond_exp_pop_IF_cond_exp" eventPort="spike"/>
         </EventOutputFile>
-        
+
         <EventOutputFile id="Spikes_file_pop_EIF_cond_exp_isfa_ista" fileName="pop_EIF_cond_exp_isfa_ista.spikes" format="TIME_ID">
-            <EventSelection id="0" select="pop_EIF_cond_exp_isfa_ista/0/EIF_cond_exp_isfa_ista_pop_EIF_cond_exp_isfa_ista" eventPort="spike"/> 
+            <EventSelection id="0" select="pop_EIF_cond_exp_isfa_ista/0/EIF_cond_exp_isfa_ista_pop_EIF_cond_exp_isfa_ista" eventPort="spike"/>
         </EventOutputFile>
-        
+
     </Simulation>
 
 </Lems>
diff --git a/NeuroML2/Positions.net.nml.h5 b/NeuroML2/Positions.net.nml.h5
index e143c95..9a48b87 100644
Binary files a/NeuroML2/Positions.net.nml.h5 and b/NeuroML2/Positions.net.nml.h5 differ
diff --git a/NeuroML2/PyNN_NeuroML2_Export.net.nml b/NeuroML2/PyNN_NeuroML2_Export.net.nml
index 726ef6e..d57a4e7 100644
--- a/NeuroML2/PyNN_NeuroML2_Export.net.nml
+++ b/NeuroML2/PyNN_NeuroML2_Export.net.nml
@@ -1,9 +1,9 @@
-<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd" id="PyNN_NeuroML2_Export">
+<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="PyNN_NeuroML2_Export">
     <notes>
     This NeuroML 2 file has been generated from: 
-        PyNN v0.10.1
-        libNeuroML v0.5.5
-        pyNeuroML v1.1.1
+        PyNN v0.11.0
+        libNeuroML v0.6.1
+        pyNeuroML v1.3.0
     </notes>
     <IF_curr_alpha id="IF_curr_alpha_pop_IF_curr_alpha" cm="1.0" i_offset="0.9" tau_syn_E="2.0" tau_syn_I="5.0" v_init="-65.0" tau_m="20.0" tau_refrac="10.0" v_reset="-62.0" v_rest="-65.0" v_thresh="-52.0"/>
     <IF_curr_exp id="IF_curr_exp_pop_IF_curr_exp" cm="1.0" i_offset="1.0" tau_syn_E="2.0" tau_syn_I="5.0" v_init="-65.0" tau_m="20.0" tau_refrac="8.0" v_reset="-70.0" v_rest="-65.0" v_thresh="-50.0"/>
diff --git a/PyNN/LEMS_2007One_pynn.py b/PyNN/LEMS_2007One_pynn.py
index 9cc5b0c..d48ba1d 100644
--- a/PyNN/LEMS_2007One_pynn.py
+++ b/PyNN/LEMS_2007One_pynn.py
@@ -9,9 +9,9 @@
 
 
     This PyNN file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
-         org.neuroml.export  v1.9.1
-         org.neuroml.model   v1.9.1
-         jLEMS               v0.10.8
+         org.neuroml.export  v1.10.1
+         org.neuroml.model   v1.10.1
+         jLEMS               v0.11.1
 
 '''
 # Main PyNN script for: net1
diff --git a/PyNN/RS.mod b/PyNN/RS.mod
index 2ae959f..7ac284b 100644
--- a/PyNN/RS.mod
+++ b/PyNN/RS.mod
@@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=RS type=izhikevich2007Cell)
 COMMENT
 
     This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
-         org.neuroml.export  v1.9.1
-         org.neuroml.model   v1.9.1
-         jLEMS               v0.10.8
+         org.neuroml.export  v1.10.1
+         org.neuroml.model   v1.10.1
+         jLEMS               v0.11.1
 
 ENDCOMMENT
 
diff --git a/PyNN/RS_Iext.mod b/PyNN/RS_Iext.mod
index aba0b88..677626d 100644
--- a/PyNN/RS_Iext.mod
+++ b/PyNN/RS_Iext.mod
@@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=RS_Iext type=pulseGenerator)
 COMMENT
 
     This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
-         org.neuroml.export  v1.9.1
-         org.neuroml.model   v1.9.1
-         jLEMS               v0.10.8
+         org.neuroml.export  v1.10.1
+         org.neuroml.model   v1.10.1
+         jLEMS               v0.11.1
 
 ENDCOMMENT
 
diff --git a/PyNN/RS_Iext_inputdefinition.py b/PyNN/RS_Iext_inputdefinition.py
index e9aa19e..4aedd92 100644
--- a/PyNN/RS_Iext_inputdefinition.py
+++ b/PyNN/RS_Iext_inputdefinition.py
@@ -9,9 +9,9 @@
 ---------------------------------------------
 
     This PyNN file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
-         org.neuroml.export  v1.9.1
-         org.neuroml.model   v1.9.1
-         jLEMS               v0.10.8
+         org.neuroml.export  v1.10.1
+         org.neuroml.model   v1.10.1
+         jLEMS               v0.11.1
 
 '''
 # Input file for Component: RS_Iext
diff --git a/PyNN/RS_celldefinition.py b/PyNN/RS_celldefinition.py
index 495b5f5..7f6a681 100644
--- a/PyNN/RS_celldefinition.py
+++ b/PyNN/RS_celldefinition.py
@@ -16,9 +16,9 @@
 ---------------------------------------------
 
     This PyNN file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
-         org.neuroml.export  v1.9.1
-         org.neuroml.model   v1.9.1
-         jLEMS               v0.10.8
+         org.neuroml.export  v1.10.1
+         org.neuroml.model   v1.10.1
+         jLEMS               v0.11.1
 
 '''
 # Cell file for Component: RS