diff --git a/Source/Generator/Create Measurement Client.vi b/Source/Generator/Create Measurement Client.vi
index 8584493fc..1eeac8773 100644
Binary files a/Source/Generator/Create Measurement Client.vi and b/Source/Generator/Create Measurement Client.vi differ
diff --git a/Source/Generator/_Measurement Plug-In Client Template/Client/Close Measurement.vi b/Source/Generator/_Measurement Plug-In Client Template/Client/Close Measurement.vi
index d8982086a..682bed5d8 100644
Binary files a/Source/Generator/_Measurement Plug-In Client Template/Client/Close Measurement.vi and b/Source/Generator/_Measurement Plug-In Client Template/Client/Close Measurement.vi differ
diff --git a/Source/Generator/_Measurement Plug-In Client Template/Client/Measure.vi b/Source/Generator/_Measurement Plug-In Client Template/Client/Measure.vi
deleted file mode 100644
index 3b455036a..000000000
Binary files a/Source/Generator/_Measurement Plug-In Client Template/Client/Measure.vi and /dev/null differ
diff --git a/Source/Generator/_Measurement Plug-In Client Template/Client/Measurement Client Template.lvlib b/Source/Generator/_Measurement Plug-In Client Template/Client/Measurement Client Template.lvlib
index e9d850e6b..d23b27789 100644
--- a/Source/Generator/_Measurement Plug-In Client Template/Client/Measurement Client Template.lvlib	
+++ b/Source/Generator/_Measurement Plug-In Client Template/Client/Measurement Client Template.lvlib	
@@ -15,7 +15,9 @@
 	<Item Name="Measurement Client Wrapper" Type="Folder">
 		<Item Name="Run Client.vi" Type="VI" URL="../Run Client.vi"/>
 	</Item>
-	<Item Name="Close Measurement.vi" Type="VI" URL="../Close Measurement.vi"/>
 	<Item Name="Create Measurement.vi" Type="VI" URL="../Create Measurement.vi"/>
-	<Item Name="Measure.vi" Type="VI" URL="../Measure.vi"/>
+	<Item Name="Close Measurement.vi" Type="VI" URL="../Close Measurement.vi"/>
+	<Item Name="Start Measurement.vi" Type="VI" URL="../Start Measurement.vi"/>
+	<Item Name="Read Measurement.vi" Type="VI" URL="../Read Measurement.vi"/>
+	<Item Name="Stop Measurement.vi" Type="VI" URL="../Stop Measurement.vi"/>
 </Library>
diff --git a/Source/Generator/_Measurement Plug-In Client Template/Client/Read Measurement.vi b/Source/Generator/_Measurement Plug-In Client Template/Client/Read Measurement.vi
new file mode 100644
index 000000000..3005354db
Binary files /dev/null and b/Source/Generator/_Measurement Plug-In Client Template/Client/Read Measurement.vi differ
diff --git a/Source/Generator/_Measurement Plug-In Client Template/Client/Run Client.vi b/Source/Generator/_Measurement Plug-In Client Template/Client/Run Client.vi
index 2524ca54b..208fa023b 100644
Binary files a/Source/Generator/_Measurement Plug-In Client Template/Client/Run Client.vi and b/Source/Generator/_Measurement Plug-In Client Template/Client/Run Client.vi differ
diff --git a/Source/Generator/_Measurement Plug-In Client Template/Client/Start Measurement.vi b/Source/Generator/_Measurement Plug-In Client Template/Client/Start Measurement.vi
new file mode 100644
index 000000000..a9e36b65d
Binary files /dev/null and b/Source/Generator/_Measurement Plug-In Client Template/Client/Start Measurement.vi differ
diff --git a/Source/Generator/_Measurement Plug-In Client Template/Client/Stop Measurement.vi b/Source/Generator/_Measurement Plug-In Client Template/Client/Stop Measurement.vi
new file mode 100644
index 000000000..49d16aeae
Binary files /dev/null and b/Source/Generator/_Measurement Plug-In Client Template/Client/Stop Measurement.vi differ
diff --git a/Source/Generator/_MeasurementClient Utility/Copy Client Template Library.vi b/Source/Generator/_MeasurementClient Utility/Copy Client Template Library.vi
index eec0ed4e5..f16fcc632 100644
Binary files a/Source/Generator/_MeasurementClient Utility/Copy Client Template Library.vi and b/Source/Generator/_MeasurementClient Utility/Copy Client Template Library.vi differ
diff --git a/Source/Generator/_MeasurementClient Utility/Template Files List.vi b/Source/Generator/_MeasurementClient Utility/Template Files List.vi
index 98c8094f5..7f6c7a7f1 100644
Binary files a/Source/Generator/_MeasurementClient Utility/Template Files List.vi and b/Source/Generator/_MeasurementClient Utility/Template Files List.vi differ
diff --git a/Source/Generator/_MeasurementClient Utility/Update Measurement from Metadata.vi b/Source/Generator/_MeasurementClient Utility/Update Measurement from Metadata.vi
index f8ed3564f..bc1fd2741 100644
Binary files a/Source/Generator/_MeasurementClient Utility/Update Measurement from Metadata.vi and b/Source/Generator/_MeasurementClient Utility/Update Measurement from Metadata.vi differ