diff --git a/ACT/LibMC.xml b/ACT/LibMC.xml
index ac20f26d..a3c0f058 100644
--- a/ACT/LibMC.xml
+++ b/ACT/LibMC.xml
@@ -244,7 +244,51 @@
 		<error name="DUPLICATESTORAGESTREAM" code="239" description="Duplicate Storage Stream" />
 		<error name="INVALIDPARTIALUPLOAD" code="240" description="Invalid Partial Upload" />
 		<error name="PARTIALUPLOADNOTFINISHED" code="241" description="Partial Upload not finished" />
+		
+		<error name="APIREQUESTNOTHANDLED" code="242" description="API Request not handled" />
+		<error name="APIREQUESTALREADYHANDLED" code="243" description="API Request already handled" />
+		<error name="INVALIDAPIREQUESTTYPE" code="244" description="Invalid API Request type" />		
+		<error name="INVALIDUPLOADSTREAM" code="245" description="Invalid Upload Stream" />
+		<error name="COULDNOTPARSEJSONREQUEST" code="246" description="Could not parse JSON request" />
+		
+		<error name="INVALIDCONTEXTUUID" code="247" description="Invalid Context UUID" />
+		<error name="INVALIDUPLOADNAME" code="248" description="Invalid Upload Name" />
+		<error name="INVALIDMIMETYPE" code="249" description="Invalid Mime Type" />
+		<error name="INVALIDSTREAMSIZE" code="250" description="Invalid Stream Size" />
+		<error name="INVALIDSHA256SUM" code="251" description="Invalid SHA256 Sum" />
+		<error name="INVALIDSTREAMUUID" code="252" description="Invalid Stream UUID" />
+		<error name="INVALIDFIELDNAME" code="253" description="Invalid field name" />		
+		<error name="UPLOADSIZEMISMATCH" code="254" description="Upload size mismatch" />
+		<error name="CONTENTTYPENOTACCEPTED" code="255" description="Content type not accepted" />
+		<error name="NOCURRENTUPLOAD" code="256" description="No current upload" />
+		<error name="UPLOADCHECKSUMMISMATCH" code="257" description="Upload checksum mismatch" />
+		<error name="INVALIDSTORAGESTREAMSTATUS" code="258" description="Invalid storage stream status" />
+		<error name="CONTEXTUUIDNOTACCEPTED" code="259" description="Context uuid not accepted" />
+		<error name="INVALIDBUILDUUID" code="260" description="Invalid build uuid" />
+		
+		<error name="MISSINGTHREADCOUNT" code="261" description="Missing thread count" />
+		<error name="INVALIDTHREADCOUNT" code="262" description="Invalid thread count" />
+		<error name="COULDNOTUPDATEBUILDSTATUS" code="263" description="Could not update build status" />							
+		<error name="INVALIDITERATOR" code="264" description="Invalid iterator" />
+		<error name="INVALIDDATATYPE" code="265" description="Invalid data type" />
+		<error name="COULDNOTSENDSIGNAL" code="266" description="Could not send signal" />
+		<error name="MISSINGSIGNALPARAMETER" code="267" description="Missing signal parameter" />
+		<error name="NOUSERINTERFACEDEFINITION" code="268" description="No user interface definition" />
 
+		<error name="MISSINGAPPNAME" code="269" description="Missing app name" />
+		<error name="MISSINGCOPYRIGHT" code="270" description="Missing copyright" />
+		<error name="MISSINGMAINPAGE" code="271" description="Missing main page" />
+		<error name="MISSINGMENUITEMID" code="272" description="Missing menu item id" />
+		<error name="MISSINGMENUITEMICON" code="273" description="Missing menu item icon" />
+		<error name="MISSINGMENUITEMCAPTION" code="274" description="Missing menu item caption" />
+		<error name="MISSINGTARGETPAGE" code="275" description="Missing menu item target page" />
+		<error name="MISSINGMENUNODE" code="276" description="Missing menu node" />
+		<error name="MISSINGTOOLBARNODE" code="277" description="Missing toolbar node" />
+		<error name="MISSINGTOOLBARITEMID" code="278" description="Missing toolbar item id" />
+		<error name="MISSINGTOOLBARITEMICON" code="279" description="Missing toolbar item icon" />
+		<error name="MISSINGTOOLBARITEMCAPTION" code="280" description="Missing toolbar item caption" />		
+		<error name="MISSINGSERVICESNODE" code="281" description="Missing services node" />
+		
 	</errors>
 	
 	
@@ -271,19 +315,46 @@
 	</class>
 
 
-	<class name="APIResponse" parent="Base" description="Response class for an API Call">
+	<class name="APIRequestHandler" parent="Base" description="API Request Handler">
+
+		<method name="ExpectsRawBody" description="checks if the raw body is needed to handle the request.">
+			<param name="Value" type="bool" pass="return" description="Flag, if the raw body is needed in the request." />	
+		</method>
+
+		<method name="ExpectsFormData" description="checks if the parsed form data is needed to handle the request.">
+			<param name="FieldCount" type="uint32" pass="out" description="Number of Form Data entries that are expected." />
+			<param name="Value" type="bool" pass="return" description="Flag, if the parsed form data is needed in the request." />	
+		</method>
+
+		<method name="GetFormDataDetails" description="returns details of expected form data.">
+			<param name="FieldIndex" type="uint32" pass="in" description="Index of Form Data Field (0..FieldCount - 1)" />
+			<param name="Name" type="string" pass="out" description="Name of the expected form data field." />	
+			<param name="IsFile" type="bool" pass="out" description="Flag, if the field Is a file field." />	
+			<param name="Mandatory" type="bool" pass="out" description="Flag, if the field MUST be present." />	
+		</method>
+
 
-		<method name="GetHTTPCode" description="returns the HTTP Errorcode to set (200 for success).">
-			<param name="HTTPCode" type="uint32" pass="return" description="HTTP Code" />	
+		<method name="SetFormDataField" description="passes the a form data field to the request handler. Call only, if ExpectsFormData returns true.">
+			<param name="Name" type="string" pass="in" description="Name of the form data field." />	
+			<param name="DataField" type="basicarray" class="uint8" pass="in" description="DataField that was sent." />
 		</method>
 
-		<method name="GetContentType" description="returns the content type string of the data.">
-			<param name="ContentType" type="string" pass="return" description="Content Type." />	
+		<method name="SetFormStringField" description="passes the a form string field to the request handler. Call only, if ExpectsFormData returns true.">
+			<param name="Name" type="string" pass="in" description="Name of the form data field." />	
+			<param name="String" type="string" pass="in" description="DataString that was sent." />
 		</method>
 
-		<method name="GetData" description="returns the stream content of the data.">
+		<method name="Handle" description="handles the request.">
+			<param name="RawBody" type="basicarray" class="uint8" pass="in" description="Raw Body that was sent. Only necessary, if ExpectsRawBody returns true." />
+			<param name="ContentType" type="string" pass="out" description="the resulting Content Type String of the data." />	
+			<param name="HTTPCode" type="uint32" pass="out" description="the resulting HTTP Errorcode (200 for success)." />	
+		</method>
+		
+		
+		<method name="GetResultData" description="returns the cached stream content of the resulting data. Call only after Handle().">
 			<param name="Data" type="basicarray" class="uint8" pass="out" description="Binary stream data" />	
 		</method>
+		
 
 	</class>
 
@@ -318,17 +389,12 @@
 		</method>
 		
 		
-		<method name="HandleAPIGetRequest" description="handle an API GET request.">
+		<method name="CreateAPIRequestHandler" description="creates an API request handler.">
 			<param name="URI" type="string" pass="in" description="URI to serve" />
-			<param name="Response" type="class" class="APIResponse" pass="return" description="Response instance." />
+			<param name="RequestMethod" type="string" pass="in" description="Request Method" />
+			<param name="HandlerInstance" type="class" class="APIRequestHandler" pass="return" description="Request Handler instance." />
 		</method>
-		
-		<method name="HandleAPIPostRequest" description="handle an API POST request.">
-			<param name="URI" type="string" pass="in" description="URI to serve" />
-			<param name="Body" type="basicarray" class="uint8" pass="in" description="Body that was sent." />
-			<param name="Response" type="class" class="APIResponse" pass="return" description="Response instance." />
-		</method>
-		
+						
 	</class>
 
 		
diff --git a/ACT/LibMCData.xml b/ACT/LibMCData.xml
index 3972474e..43d010f9 100644
--- a/ACT/LibMCData.xml
+++ b/ACT/LibMCData.xml
@@ -231,10 +231,51 @@
 		<error name="DUPLICATESTORAGESTREAM" code="239" description="Duplicate Storage Stream" />
 		<error name="INVALIDPARTIALUPLOAD" code="240" description="Invalid Partial Upload" />
 		<error name="PARTIALUPLOADNOTFINISHED" code="241" description="Partial Upload not finished" />
-		
-		
-		
-		
+		<error name="APIREQUESTNOTHANDLED" code="242" description="API Request not handled" />
+		<error name="APIREQUESTALREADYHANDLED" code="243" description="API Request already handled" />
+		<error name="INVALIDAPIREQUESTTYPE" code="244" description="Invalid API Request type" />
+		<error name="INVALIDUPLOADSTREAM" code="245" description="Invalid Upload Stream" />
+		<error name="COULDNOTPARSEJSONREQUEST" code="246" description="Could not parse JSON request" />
+		
+		<error name="INVALIDCONTEXTUUID" code="247" description="Invalid Context UUID" />
+		<error name="INVALIDUPLOADNAME" code="248" description="Invalid Upload Name" />
+		<error name="INVALIDMIMETYPE" code="249" description="Invalid Mime Type" />
+		<error name="INVALIDSTREAMSIZE" code="250" description="Invalid Stream Size" />
+		<error name="INVALIDSHA256SUM" code="251" description="Invalid SHA256 Sum" />
+		<error name="INVALIDSTREAMUUID" code="252" description="Invalid Stream UUID" />
+		<error name="INVALIDFIELDNAME" code="253" description="Invalid field name" />		
+		<error name="UPLOADSIZEMISMATCH" code="254" description="Upload size mismatch" />
+		<error name="CONTENTTYPENOTACCEPTED" code="255" description="Content type not accepted" />
+		<error name="NOCURRENTUPLOAD" code="256" description="No current upload" />		
+		<error name="UPLOADCHECKSUMMISMATCH" code="257" description="Upload checksum mismatch" />
+		<error name="INVALIDSTORAGESTREAMSTATUS" code="258" description="Invalid storage stream status" />
+		<error name="CONTEXTUUIDNOTACCEPTED" code="259" description="Context uuid not accepted" />
+		<error name="INVALIDBUILDUUID" code="260" description="Invalid build uuid" />
+		
+		<error name="MISSINGTHREADCOUNT" code="261" description="Missing thread count" />
+		<error name="INVALIDTHREADCOUNT" code="262" description="Invalid thread count" />		
+		<error name="COULDNOTUPDATEBUILDSTATUS" code="263" description="Could not update build status" />							
+		<error name="INVALIDITERATOR" code="264" description="Invalid iterator" />
+		<error name="INVALIDDATATYPE" code="265" description="Invalid data type" />
+		
+		<error name="COULDNOTSENDSIGNAL" code="266" description="Could not send signal" />
+		<error name="MISSINGSIGNALPARAMETER" code="267" description="Missing signal parameter" />
+		<error name="NOUSERINTERFACEDEFINITION" code="268" description="No user interface definition" />
+		
+		<error name="MISSINGAPPNAME" code="269" description="Missing app name" />
+		<error name="MISSINGCOPYRIGHT" code="270" description="Missing copyright" />
+		<error name="MISSINGMAINPAGE" code="271" description="Missing main page" />
+		<error name="MISSINGMENUITEMID" code="272" description="Missing menu item id" />
+		<error name="MISSINGMENUITEMICON" code="273" description="Missing menu item icon" />
+		<error name="MISSINGMENUITEMCAPTION" code="274" description="Missing menu item caption" />
+		<error name="MISSINGTARGETPAGE" code="275" description="Missing menu item target page" />
+		<error name="MISSINGMENUNODE" code="276" description="Missing menu node" />
+		<error name="MISSINGTOOLBARNODE" code="277" description="Missing toolbar node" />
+		<error name="MISSINGTOOLBARITEMID" code="278" description="Missing toolbar item id" />
+		<error name="MISSINGTOOLBARITEMICON" code="279" description="Missing toolbar item icon" />
+		<error name="MISSINGTOOLBARITEMCAPTION" code="280" description="Missing toolbar item caption" />
+		<error name="MISSINGSERVICESNODE" code="281" description="Missing services node" />		
+
 	</errors>
 	
 
@@ -259,8 +300,18 @@
 		<option name="Validating" value="100"/>
 		<option name="Validated" value="200"/>
 		<option name="Archived" value="300"/>
+		<option name="Deleted" value="400"/>
 	</enum>	
-	
+
+	<enum name="BuildJobDataType">
+		<option name="Unknown" value="0"/>
+		<option name="Toolpath" value="1"/>
+		<option name="PNGImage" value="2"/>
+		<option name="JPEGImage" value="3"/>
+		<option name="Thumbnail" value="4"/>
+		<option name="Timeline" value="5"/>
+		<option name="CustomBinaryData" value="100"/>
+	</enum>		
 	
 	<functiontype name="StreamReadCallback" description="Callback to call for reading a data chunk">
 		<param name="ByteData" type="pointer" pass="in" description="Pointer to a buffer to read data into"/>
@@ -314,10 +365,6 @@
 		<method name="GetUUID" description="returns the uuid of a storage stream.">
 			<param name="UUID" type="string" pass="return" description="UUID String" />	
 		</method>
-
-		<method name="GetContextUUID" description="returns the context uuid of a storage stream. Context might be for example a project uuid that this stream is part of.">
-			<param name="ContextUUID" type="string" pass="return" description="UUID String" />	
-		</method>
 	
 		<method name="GetTimeStamp" description="returns the timestamp of a storage stream.">
 			<param name="Timestamp" type="string" pass="return" description="Timestamp in ISO8601 UTC format" />	
@@ -394,10 +441,50 @@
 		<method name="FinishPartialStream" description="Finishes storing a stream.">
 			<param name="UUID" type="string" pass="in" description="UUID of storage stream. MUST have been created with BeginPartialStream first." />	
 		</method>	
+		
+		<method name="GetMaxStreamSize" description="Returns the maximum stream size that the data model allows.">
+			<param name="MaxStreamSize" type="uint64" pass="return" description="Maximum Stream Size in Bytes." />	
+		</method>	
+			
+		<method name="ContentTypeIsAccepted" description="Returns if the given content type is an acceptable value.">
+			<param name="ContentType" type="string" pass="in" description="Content type string (is taken case-insensitive)" />	
+			<param name="Accepted" type="bool" pass="return" description="Content type is accepted." />	
+		</method>	
 	
 	</class>
 
 
+	<class name="BuildJobData" parent="Base" description="Build Job Data instance">
+
+		<method name="GetName" description="returns the name of a build job.">
+			<param name="Name" type="string" pass="return" description="Name String" />	
+		</method>
+
+		<method name="GetTimeStamp" description="returns the timestamp when the job was created.">
+			<param name="Timestamp" type="string" pass="return" description="Timestamp in ISO8601 UTC format" />	
+		</method>
+				
+		<method name="GetStorageStream" description="returns the storage stream of the build.">
+			<param name="StreamInstance" type="class" class="StorageStream" pass="return" description="Stream Instance." />
+		</method>
+
+		<method name="GetDataType" description="returns the data type of the job data.">
+			<param name="DataType" type="enum" class="BuildJobDataType" pass="return" description="Data type of the job data" />	
+		</method>
+
+		<method name="GetMIMEType" description="returns the mime type of a storage stream.">
+			<param name="MimeType" type="string" pass="return" description="Mime Type String" />	
+		</method>
+
+	</class>
+
+	<class name="BuildJobDataIterator" parent="Iterator">
+		<method name="GetCurrentJobData" description="Returns the build job data the iterator points at.">
+			<param name="CurrentInstance" type="handle" class="BuildJobData" pass="return" description="returns the build job instance."/>
+		</method>
+	</class>
+
+
 	<class name="BuildJob" parent="Base" description="Build Job instance">
 
 		<method name="GetUUID" description="returns the uuid of a build job.">
@@ -412,6 +499,10 @@
 			<param name="Status" type="enum" class="BuildJobStatus" pass="return" description="Status of build job." />	
 		</method>
 
+		<method name="GetLayerCount" description="returns the layer count of a build job.">
+			<param name="LayerCount" type="uint32" pass="return" description="Layer Count of build job" />	
+		</method>
+
 		<method name="GetTimeStamp" description="returns the timestamp when the job was created.">
 			<param name="Timestamp" type="string" pass="return" description="Timestamp in ISO8601 UTC format" />	
 		</method>
@@ -419,12 +510,51 @@
 		<method name="GetStorageStream" description="returns the storage stream of the build.">
 			<param name="StreamInstance" type="class" class="StorageStream" pass="return" description="Stream Instance." />
 		</method>
+
+		<method name="GetStorageStreamUUID" description="returns the storage stream uuid of the build.">
+			<param name="StreamUUID" type="string" pass="return" description="Stream UUID." />
+		</method>
 		
 		<method name="GetBuildJobLogger" description="creates a build job log session access class.">
 			<param name="LogSession" type="class" class="LogSession" pass="return" description="LogSession class instance." />	
 		</method>
 		
-										
+		<method name="StartValidating" description="Starts validation of a build job.">
+		</method>
+
+		<method name="FinishValidating" description="Finishes validation of a build job.">
+			<param name="LayerCount" type="uint32" pass="in" description="Layer count" />
+		</method>
+
+		<method name="ArchiveJob" description="Archives a Job. Job MUST not be opened in the system. Job MUST be of state validated.">
+		</method>
+
+		<method name="UnArchiveJob" description="Unarchives a Job. Job MUST be of state archived.">
+		</method>
+
+		<method name="DeleteJob" description="Deletes a Job permanently including all referencing data objects. Job MUST be of state archived to succeed.">
+		</method>
+
+		<method name="JobCanBeArchived" description="Returns if a job is opened.">
+			<param name="CanBeArchived" type="bool" pass="return" description="returns if the job can be archived." />
+		</method>
+
+		<method name="AddJobData" description="Adds additional data to the Job. Job MUST be of state validated in order to add job data.">
+			<param name="Name" type="string" pass="in" description="Name of the job" />
+			<param name="Stream" type="class" class="StorageStream" pass="in" description="Storage Stream Instance" />
+			<param name="DataType" type="enum" class="BuildJobDataType" pass="in" description="Datatype of Job data" />
+			<param name="UserID" type="string" pass="in" description="Currently authenticated user" />
+		</method>
+
+		<method name="ListJobDataByType" description="Retrieves a list of build job data objects, filtered by type.">
+			<param name="DataType" type="enum" class="BuildJobDataType" pass="in" description="Datatype of Job data." />	
+			<param name="IteratorInstance" type="class" class="BuildJobDataIterator" pass="return" description="Build Job Data Iterator Instance." />
+		</method>
+
+		<method name="ListJobData" description="Retrieves a list of build job data objects.">
+			<param name="IteratorInstance" type="class" class="BuildJobDataIterator" pass="return" description="Build Job Data Iterator Instance." />
+		</method>
+									
 	</class>
 
 	<class name="BuildJobIterator" parent="Iterator">
@@ -440,7 +570,7 @@
 			<param name="JobUUID" type="string" pass="in" description="UUID String for the build job. Must be unique and newly generated." />	
 			<param name="Name" type="string" pass="in" description="Name String" />	
 			<param name="UserID" type="string" pass="in" description="Currently authenticated user" />
-			<param name="StreamInstance" type="class" class="StorageStream" pass="in" description="Storage stream to create the job from. ContextUUID of Stream MUST be the Job UUID." />
+			<param name="StorageStreamUUID" type="string" pass="in" description="Storage stream uuid for the job. Needs not exist yet." />
 			<param name="JobInstance" type="class" class="BuildJob" pass="return" description="Build Job Instance." />
 		</method>
 
diff --git a/ACT/LibMCDriverEnv.xml b/ACT/LibMCDriverEnv.xml
index 0ec32a83..68e2835e 100644
--- a/ACT/LibMCDriverEnv.xml
+++ b/ACT/LibMCDriverEnv.xml
@@ -60,14 +60,81 @@
 	</errors>
 	
 
+
 	<class name="Base">
 	</class>
 
+
+	<class name="WorkingFileExecution" parent="Base" description="Working File Execution Object">
+
+		<method name="GetStatus" description = "Returns the execution status">
+		</method>
+
+		<method name="ReturnStdOut" description = "Returns the output of the executable as string buffer">
+			<param name="StringBuffer" type="string" pass="return" description="stdout buffer" />
+		</method>
+
+
+	</class>
+
+
+	<class name="WorkingFile" parent="Base" description="Working File Access Object">
+
+		<method name="GetAbsoluteFileName" description = "Retrieves absolute file name of the working file">
+			<param name="FileName" type="string" pass="return" description="global path of the file" />
+		</method>
+
+		<method name="GetSize" description = "Returns the size of temporary file.">
+			<param name="FileSize" type="uint64" pass="return" description="file size" />
+		</method>
+
+		<method name="CalculateSHA2" description = "Calculates the SHA256 checksum of the file.">
+			<param name="SHA2" type="string" pass="return" description="sha256 checksum" />
+		</method>
+
+		<method name="DeleteFile" description = "Deletes the temporary file.">
+		</method>
+
+		<method name="ExecuteFile" description = "Executes the temporary file, if it is an executable.">
+			<param name="Execution" type="class" class="WorkingFileExecution" pass="return" description="execution object" />
+		</method>
+
+	</class>
+
+
+
+	<class name="WorkingDirectory" parent="Base" description="Working Directory Access Object">
+
+		<method name="GetAbsoluteFilePath" description = "Retrieves absolute file path.">
+			<param name="FilePath" type="string" pass="return" description="global path of the directory, including path delimiter." />
+		</method>
+
+		<method name="StoreCustomData" description = "Stores a data buffer in a temporary file.">
+			<param name="FileName" type="string" pass="in" description="filename to store to. Can not include any path delimiters or .." />
+			<param name="DataBuffer" type="basicarray" class="uint8" pass="in" description="file data to store to." />
+			<param name="WorkingFile" type="class" class="WorkingFile" pass="return" description="working file instance." />
+		</method>
+
+		<method name="StoreDriverData" description = "Stores attached driver data in a temporary file.">
+			<param name="FileName" type="string" pass="in" description="filename to store to. Can not include any path delimiters or .." />
+			<param name="Identifier" type="string" pass="in" description="identifier of the binary data in the driver package." />
+			<param name="WorkingFile" type="class" class="WorkingFile" pass="return" description="working file instance." />
+		</method>
+
+	</class>
+
 	<class name="DriverEnvironment" parent="Base" description="Environment of the driver">
 	  
+		<method name="CreateWorkingDirectory" description = "creates a temporary working directory.">
+			<param name="WorkingDirectory" type="class" class="WorkingDirectory" pass="return" description="creates a working directory" />
+		</method>
 
-	</class>
+		<method name="RetrieveDriverData" description = "retrieves attached driver data into a memory buffer.">
+			<param name="Identifier" type="string" pass="in" description="identifier of the binary data in the driver package." />
+			<param name="DataBuffer" type="basicarray" class="uint8" pass="out" description="buffer data." />
+		</method>
 
+	</class>
 
 		
 	<global baseclassname="Base" stringoutclassname="Base" releasemethod="ReleaseInstance" acquiremethod="AcquireInstance" versionmethod="GetVersion" errormethod="GetLastError" symbollookupmethod="GetSymbolLookupMethod">
@@ -77,6 +144,7 @@
 			<param name="Minor" type="uint32" pass="out" description="returns the minor version of this library" />
 			<param name="Micro" type="uint32" pass="out" description="returns the micro version of this library" />
 		</method>
+		
 		<method name="GetLastError" description="Returns the last error recorded on this object">
 			<param name="Instance" type="class" class="Base" pass="in" description="Instance Handle" />
 			<param name="ErrorMessage" type="string" pass="out" description="Message of the last error" />
diff --git a/ACT/LibMCEnv.xml b/ACT/LibMCEnv.xml
index f4abe3c7..be848d4d 100644
--- a/ACT/LibMCEnv.xml
+++ b/ACT/LibMCEnv.xml
@@ -65,14 +65,26 @@
 		<option name="Loop" value="2" />
 		<option name="Polyline" value="3" />
 	</enum>
+
+	<enum name="ToolpathProfileValueType">
+		<option name="Custom" value="0" />
+		<option name="Speed" value="1" />
+		<option name="JumpSpeed" value="2" />
+		<option name="ExtrusionFactor" value="3" />
+		<option name="LaserPower" value="4" />
+		<option name="StartDelay" value="5" />
+		<option name="EndDelay" value="6" />
+		<option name="PolyDelay" value="7" />
+	</enum>
 	
 	<struct name="Position2D">
-		<member name="Coordinates" type="single" rows="2"/>
+		<member name="Coordinates" type="int32" rows="2"/>
 	</struct>
 	
 	<class name="Base">
 	</class>
 
+
 	<class name="ToolpathLayer" parent="Base">
 	  
 		<method name="GetLayerDataUUID" description="Retrieves the layerdata's uuid">
@@ -93,6 +105,17 @@
 			<param name="Index" type="uint32" pass="in" description="Index. Must be between 0 and Count - 1." />
 			<param name="ProfileUUID" type="string" pass="return" description="Segment Profile UUID" />
 		</method>
+
+		<method name="GetSegmentProfileValue" description="Retrieves an assigned profile custom value.">
+			<param name="ValueName" type="string" pass="in" description="Value Name to query for." />
+			<param name="Value" type="string" pass="return" description="String Value." />
+		</method>
+
+		<method name="GetSegmentProfileTypedValue" description="Retrieves an assigned profile value of a standard type.">
+			<param name="ValueType" type="enum" class="ToolpathProfileValueType" pass="in" description="Enum to query for. MUST NOT be custom." />
+			<param name="Value" type="double" pass="return" description="Double Value" />
+		</method>
+
 		
 		<method name="GetSegmentPartUUID" description="Retrieves the assigned segment part uuid.">
 			<param name="Index" type="uint32" pass="in" description="Index. Must be between 0 and Count - 1." />
@@ -101,7 +124,15 @@
 		
 		<method name="GetSegmentPointData" description="Retrieves the assigned segment point list. For type hatch, the points are taken pairwise.">
 			<param name="Index" type="uint32" pass="in" description="Index. Must be between 0 and Count - 1." />
-			<param name="PointData" type="structarray" class="Position2D" pass="out" description="The point data array" />
+			<param name="PointData" type="structarray" class="Position2D" pass="out" description="The point data array. Positions are absolute in units." />
+		</method>
+		
+		<method name="GetZValue" description="Retrieves the layers Z Value in units.">
+			<param name="ZValue" type="int32" pass="return" description="Z Value of the layer in units." />
+		</method>
+		
+		<method name="GetUnits" description="Retrieves the toolpath units in mm.">
+			<param name="Units" type="double" pass="return" description="Toolpath units." />
 		</method>
 		
 	</class>
@@ -109,8 +140,8 @@
 
 	<class name="ToolpathAccessor" parent="Base">
 	
-		<method name="GetUUID" description="Returns Toolpath data UUID.">
-			<param name="UUID" type="string" pass="return" description="Returns toolpath data uuid." />
+		<method name="GetStorageUUID" description="Returns Toolpath storage UUID.">
+			<param name="StorageUUID" type="string" pass="return" description="Returns toolpath storage uuid." />
 		</method>
 	
 		<method name="GetLayerCount" description="Returns layer count.">
@@ -121,10 +152,61 @@
 			<param name="LayerIndex" type="uint32" pass="in" description="Layer Index." />
 			<param name="LayerData" type="class" class="ToolpathLayer" pass="return" description="Toolpath layer object." />
 		</method>
-	
+		
+		<method name="GetUnits" description="Retrieves the toolpath units in mm.">
+			<param name="Units" type="double" pass="return" description="Toolpath units." />
+		</method>
+			
 	</class>
 
 
+	<class name="Build" parent="Base" description="Build instance to access build files">
+
+		<method name="GetName" description="Returns name of the build.">
+			<param name="Name" type="string" pass="return" description="Name of the build." />
+		</method>
+
+		<method name="GetBuildUUID" description="Returns uuid of the build.">
+			<param name="BuildUUID" type="string" pass="return" description="UUID of the build." />
+		</method>
+
+		<method name="GetStorageUUID" description="Returns storage uuid of the build.">
+			<param name="StorageUUID" type="string" pass="return" description="Storage UUID of the build." />
+		</method>
+
+		<method name="GetStorageSHA256" description="Returns SHA256 of the build stream.">
+			<param name="SHA256" type="string" pass="return" description="SHA256 of the build stream." />
+		</method>
+
+		<method name="GetLayerCount" description="Returns cached layer count of the toolpath.">
+			<param name="LayerCount" type="uint32" pass="return" description="Returns layer count." />
+		</method>
+
+		<method name="LoadToolpath" description="loads the a toolpath into memory">
+		</method>
+
+		<method name="UnloadToolpath" description="unloads the a toolpath from memory, if it has been loaded before.">
+		</method>
+
+		<method name="ToolpathIsLoaded" description="checks, if a toolpath object is loaded to memory.">
+			<param name="IsLoaded" type="bool" pass="return" description="returns if toolpath is loaded." />
+		</method>
+
+		<method name="CreateToolpathAccessor" description="Creates an accessor object for a toolpath. Toolpath MUST have been loaded with LoadToolpath before.">
+			<param name="ToolpathInstance" type="class" class="ToolpathAccessor" pass="return" description="Toolpath instance." />
+		</method>
+
+		<method name="AddBinaryData" description="Adds binary data to store with the build.">
+			<param name="Name" type="string" pass="in" description="Name of the attache data block." />
+			<param name="MIMEType" type="string" pass="in" description="Mime type of the data." />
+			<param name="Content" type="basicarray" class="uint8" pass="in" description="Stream content to store" />
+			<param name="DataUUID" type="string" pass="return" description="Data UUID of the attachment." />
+		</method>
+
+				
+	</class>
+	
+
 	<class name="SignalTrigger" parent="Base" description="Class for signal triggering">
 
 		<method name="CanTrigger" description="Returns, if signal channel is available.">
@@ -152,6 +234,11 @@
 			<param name="Value" type="string" pass="in" description="Value" />
 		</method>
 
+		<method name="SetUUID" description="sets a uuid value">
+			<param name="Name" type="string" pass="in" description="Name" />
+			<param name="Value" type="string" pass="in" description="Value" />
+		</method>
+
 		<method name="SetDouble" description="sets a double">
 			<param name="Name" type="string" pass="in" description="Name" />
 			<param name="Value" type="double" pass="in" description="Value" />
@@ -172,6 +259,11 @@
 			<param name="Value" type="string" pass="return" description="Value" />
 		</method>
 
+		<method name="GetUUIDResult" description="returns a uuid value of the result">
+			<param name="Name" type="string" pass="in" description="Name" />
+			<param name="Value" type="string" pass="return" description="Value" />
+		</method>
+
 		<method name="GetDoubleResult" description="returns a string value of the result">
 			<param name="Name" type="string" pass="in" description="Name" />
 			<param name="Value" type="double" pass="return" description="Value" />
@@ -213,6 +305,12 @@
 			<param name="Value" type="string" pass="return" description="Value" />
 		</method>
 
+		<method name="GetUUID" description="gets a uuid value">
+			<param name="Name" type="string" pass="in" description="Name" />
+			<param name="Value" type="string" pass="return" description="Value" />
+		</method>
+
+
 		<method name="GetDouble" description="gets a double">
 			<param name="Name" type="string" pass="in" description="Name" />
 			<param name="Value" type="double" pass="return" description="Value" />
@@ -233,6 +331,11 @@
 			<param name="Value" type="string" pass="in" description="Value" />
 		</method>
 
+		<method name="SetUUIDResult" description="returns a uuid value of the result">
+			<param name="Name" type="string" pass="in" description="Name" />
+			<param name="Value" type="string" pass="in" description="Value" />
+		</method>
+
 		<method name="SetDoubleResult" description="returns a string value of the result">
 			<param name="Name" type="string" pass="in" description="Name" />
 			<param name="Value" type="double" pass="in" description="Value" />
@@ -253,7 +356,7 @@
 
 	<class name="StateEnvironment" parent="Base" description="Environment of the state">
 	  
-		<method name="CreateSignal" description="creates a signal object to trigger.">
+		<method name="PrepareSignal" description="prepares a signal object to trigger later.">
 			<param name="MachineInstance" type="string" pass="in" description="State machine instance name" />
 			<param name="SignalName" type="string" pass="in" description="Name Of signal channel." />
 			<param name="SignalInstance" type="class" class="SignalTrigger" pass="return" description="Signal trigger object." />
@@ -277,27 +380,14 @@
 			<param name="DriverHandle" type="pointer" pass="out" description="Handle of the driver." />
 		</method>
 
-		<method name="LoadToolpath" description="Loads a toolpath from disk into memory.">
-			<param name="ToolpathUUID" type="string" pass="in" description="UUID of the toolpath entity." />
-		</method>
-
-		<method name="UnloadToolpath" description="unloads the a toolpath. It MUST have been loaded to memory before with LoadToolpath.">
-			<param name="ToolpathUUID" type="string" pass="in" description="UUID of the toolpath entity." />
+		<method name="GetBuildJob" description="Returns a instance of a build object.">
+			<param name="BuildUUID" type="string" pass="in" description="UUID of the build entity." />
+			<param name="BuildInstance" type="class" class="Build" pass="return" description="Build instance" />
 		</method>
 
 		<method name="UnloadAllToolpathes" description="unloads all toolpath in memory to clean up">
 		</method>
 
-		<method name="CreateToolpathAccessor" description="creates an accessor object for a toolpath, if loaded to memory before.">
-			<param name="ToolpathUUID" type="string" pass="in" description="UUID of the toolpath entity." />
-			<param name="ToolpathInstance" type="class" class="ToolpathAccessor" pass="return" description="UUID of the toolpath entity." />
-		</method>
-
-		<method name="ToolpathIsLoaded" description="checks, if a toolpath object is loaded to memory.">
-			<param name="ToolpathUUID" type="string" pass="in" description="UUID of the toolpath entity." />
-			<param name="IsLoaded" type="bool" pass="return" description="returns if toolpath is loaded." />
-		</method>
-
 
 		<method name="SetNextState" description="sets the next state">
 			<param name="StateName" type="string" pass="in" description="Name of next state" />
@@ -330,6 +420,11 @@
 			<param name="Value" type="string" pass="in" description="Value" />
 		</method>
 
+		<method name="StoreUUID" description="stores a uuid in the current state machine">
+			<param name="Name" type="string" pass="in" description="Name" />
+			<param name="Value" type="string" pass="in" description="Value" />
+		</method>
+
 		<method name="StoreInteger" description="stores a string in the current state machine">
 			<param name="Name" type="string" pass="in" description="Name" />
 			<param name="Value" type="int64" pass="in" description="Value" />
@@ -355,6 +450,11 @@
 			<param name="Value" type="string" pass="return" description="Value" />
 		</method>
 
+		<method name="RetrieveUUID" description="retrieves a uuid from the current state machine. Fails if value has not been stored before.">
+			<param name="Name" type="string" pass="in" description="Name" />
+			<param name="Value" type="string" pass="return" description="Value" />
+		</method>
+
 		<method name="RetrieveInteger" description="retrieves a string from the current state machine. Fails if value has not been stored before.">
 			<param name="Name" type="string" pass="in" description="Name" />
 			<param name="Value" type="int64" pass="return" description="Value" />
@@ -386,6 +486,12 @@
 			<param name="Value" type="string" pass="in" description="Value to set" />
 		</method>
 
+		<method name="SetUUIDParameter" description="sets a uuid parameter">
+			<param name="ParameterGroup" type="string" pass="in" description="Parameter Group" />
+			<param name="ParameterName" type="string" pass="in" description="Parameter Name" />
+			<param name="Value" type="string" pass="in" description="Value to set" />
+		</method>
+
 		<method name="SetDoubleParameter" description="sets a double parameter">
 			<param name="ParameterGroup" type="string" pass="in" description="Parameter Group" />
 			<param name="ParameterName" type="string" pass="in" description="Parameter Name" />
@@ -410,6 +516,12 @@
 			<param name="Value" type="string" pass="return" description="Value to set" />
 		</method>
 
+		<method name="GetUUIDParameter" description="returns a uuid parameter">
+			<param name="ParameterGroup" type="string" pass="in" description="Parameter Group" />
+			<param name="ParameterName" type="string" pass="in" description="Parameter Name" />
+			<param name="Value" type="string" pass="return" description="Value to set" />
+		</method>
+
 		<method name="GetDoubleParameter" description="returns a double parameter">
 			<param name="ParameterGroup" type="string" pass="in" description="Parameter Group" />
 			<param name="ParameterName" type="string" pass="in" description="Parameter Name" />
diff --git a/ACT/act.exe b/ACT/act.exe
index 7a1d9a6a..ae2b8f1e 100644
Binary files a/ACT/act.exe and b/ACT/act.exe differ
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70fe7907..07a8fcb7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ project(LibMC)
 add_subdirectory(Drivers)
 add_subdirectory(Plugins)
 
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 14)
 
 # The location of autogenerated interfaces
 set(CMAKE_CURRENT_AUTOGENERATED_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Framework/InterfacesCore)
@@ -59,6 +59,10 @@ file(GLOB LIBMC_SRC_API
 	${CMAKE_CURRENT_SOURCE_DIR}/Implementation/API/*.cpp
 )
 
+file(GLOB LIBMC_SRC_UI
+	${CMAKE_CURRENT_SOURCE_DIR}/Implementation/UI/*.cpp
+)
+
 file(GLOB LIBMC_SRC_LIBMC
 	${CMAKE_CURRENT_SOURCE_DIR}/Implementation/LibMC/*.cpp
 	${CMAKE_CURRENT_AUTOGENERATED_DIR}/libmc_interfaceexception.cpp
@@ -91,6 +95,7 @@ file(GLOB LIBMC_SRC_DEP_CROSSGUID
 source_group("core" FILES ${LIBMC_SRC_CORE})
 source_group("common" FILES ${LIBMC_SRC_COMMON})
 source_group("api" FILES ${LIBMC_SRC_API})
+source_group("ui" FILES ${LIBMC_SRC_UI})
 source_group("libmc" FILES ${LIBMC_SRC_LIBMC})
 source_group("libmcenv" FILES ${LIBMC_SRC_LIBMCENV})
 source_group("libmcdriverenv" FILES ${LIBMC_SRC_LIBMCDRIVERENV})
@@ -104,6 +109,7 @@ set(LIBMC_SRC
   ${LIBMC_SRC_CORE} 
   ${LIBMC_SRC_COMMON}
   ${LIBMC_SRC_API}
+  ${LIBMC_SRC_UI}
   ${LIBMC_SRC_LIBMC}
   ${LIBMC_SRC_LIBMCENV}
   ${LIBMC_SRC_LIBMCDRIVERENV}
@@ -123,12 +129,15 @@ set_target_properties(libmc PROPERTIES VISIBILITY_INLINES_HIDDEN ON)
 
 # This makes sure symbols are exported
 target_compile_options(libmc PRIVATE "-D__LIBMC_EXPORTS")
+target_compile_options(libmc PRIVATE "-D__GITHASH=${GLOBALGITHASH}")
 target_include_directories(libmc PRIVATE ${CMAKE_CURRENT_AUTOGENERATED_DIR})
 target_include_directories(libmc PRIVATE ${CMAKE_CURRENT_HEADERS_CORE_DIR})
 target_include_directories(libmc PRIVATE ${CMAKE_CURRENT_HEADERS_DEV_DIR})
 target_include_directories(libmc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Implementation)
+target_include_directories(libmc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Implementation/API)
 target_include_directories(libmc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Implementation/Core)
 target_include_directories(libmc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Implementation/Common)
+target_include_directories(libmc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Implementation/UI)
 target_include_directories(libmc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Implementation/LibMC)
 target_include_directories(libmc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Implementation/LibMCEnv)
 target_include_directories(libmc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Implementation/LibMCDriverEnv)
@@ -188,10 +197,15 @@ set_target_properties(libmcdata PROPERTIES VISIBILITY_INLINES_HIDDEN ON)
 
 if(WIN32)
 target_link_libraries(libmcdata ${CMAKE_CURRENT_SOURCE_DIR}/Libraries/SQLite/sqlite3.lib)
+elseif(UNIX AND NOT APPLE)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Libraries/SQLite)
+target_link_libraries(libmcdata SQLite3)
 endif()
 
 # This makes sure symbols are exported
 target_compile_options(libmcdata PRIVATE "-D__LIBMCDATA_EXPORTS")
+target_compile_options(libmcdata PRIVATE "-D__GITHASH=${GLOBALGITHASH}")
+
 target_include_directories(libmcdata PRIVATE ${CMAKE_CURRENT_AUTOGENERATED_DIR})
 target_include_directories(libmcdata PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Libraries/SQLite)
 target_include_directories(libmcdata PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Libraries)
diff --git a/Client/src/App.vue b/Client/src/App.vue
index ed847e46..985d184e 100644
--- a/Client/src/App.vue
+++ b/Client/src/App.vue
@@ -1,924 +1,280 @@
 <template>
-	<v-app id="inspire">
-		<v-navigation-drawer
-				v-if="UI.isLoggedIn"
-				v-model="UI.showDrawer"
-				clipped
-				:clipped-left="$vuetify.breakpoint.lgAndUp"
-				disable-resize-watcher
-				app
-				>
-				
-			<v-list dense>
-				<template v-for="item in UI.MenuItems">
-					<v-list-group
-							v-if="item.children"
-							:key="item.text"
-							v-model="item.model"
-							:prepend-icon="item.model ? item.icon : item['icon-alt']"			
-							>
-						<template v-slot:activator>
-							<v-list-item-content>
-								<v-list-item-title v-on:click.stop="uiChangePage (item.targetPage, item.targetSubPage)">
-									{{ item.text }}
-								</v-list-item-title>
-							</v-list-item-content>
-						</template>
-
-						<v-list-item
-								v-for="(child, i) in item.children"
-								:key="i"
-								link
-								v-on:click.stop="uiChangePage (child.targetPage, child.targetSubPage)"
-								>
-							<v-list-item-action v-if="child.icon">
-								<v-icon>{{ child.icon }}</v-icon>
-							</v-list-item-action>
-							<v-list-item-content>
-								<v-list-item-title>
-									{{ child.text }}
-								</v-list-item-title>
-							</v-list-item-content>
-						</v-list-item>
-					</v-list-group>
-
-					<v-list-item
-							v-else
-							:key="item.text"
-							link
-							v-on:click.stop="uiChangePage (item.targetPage, item.targetSubPage)"
-							>
-						<v-list-item-action>
-							<v-icon>{{ item.icon }}</v-icon>
-						</v-list-item-action>
-						<v-list-item-content>
-							<v-list-item-title>
-								{{ item.text }}
-							</v-list-item-title>
-						</v-list-item-content>
-					</v-list-item>
-				</template>
-			</v-list>
-		</v-navigation-drawer>
-
-		
-		<v-app-bar
-				app
-				color="primary"
-				dark
-				v-if="UI.isLoggedIn"
-				:clipped-left="$vuetify.breakpoint.lgAndUp"
-				>
-			<v-app-bar-nav-icon v-on:click.stop="uiToggleDrawer" />
-			<v-btn     
-					tile		
-					large
-					color="primary"
-					dark
-					v-on:click.stop="uiChangePage ('main')"
-					>
-					
-					{{ uiButtonCaptionCheck (UI.textApplicationName) }}
-			</v-btn>
-
-
-			<v-spacer />
-
-
-			<v-btn color="primary" large v-on:click.stop="uiChangePage ('builds')">
-				<v-icon left>mdi-factory</v-icon>{{ uiButtonCaptionCheck ("Builds") }}
-			</v-btn>
-			<v-btn color="primary" large v-on:click.stop="uiChangePage ('states')">
-				<v-icon left>mdi-speedometer</v-icon>{{ uiButtonCaptionCheck ("Status") }}
-			</v-btn>
-			<v-btn color="primary" large v-on:click.stop="uiChangePage ('logs')">
-				<v-icon left>mdi-message-text</v-icon>{{ uiButtonCaptionCheck ("Logs") }}
-			</v-btn>
-			<v-btn color="primary" large v-on:click.stop="uiChangePage ('settings')">
-				<v-icon left>mdi-settings</v-icon>{{ uiButtonCaptionCheck ("Settings") }}				
-			</v-btn>
-
-		</v-app-bar>
-		
-		
-		
-		<v-content>
-		
-		
-			<v-container class="fill-height" fluid v-if="!UI.isLoggedIn">
-		
-				<v-row align="center" justify="center">
-					<v-col cols="12" sm="8" md="4">
-						<v-card class="elevation-12">
-							<v-toolbar color="primary" dark flat>
-								<v-toolbar-title>{{ UI.textApplicationName }}</v-toolbar-title>
-							</v-toolbar>
-							<v-card-text>
-								<v-form>
-									<v-text-field label="User" name="login" prepend-icon="mdi-account" type="text" v-model="UI.uiLoginUser" autofocus clearable />
-									<v-text-field id="password" label="Password" name="password" prepend-icon="mdi-lock" type="password" clearable v-model="UI.uiLoginPassword" />
-								</v-form>
-							</v-card-text>
-							<v-card-actions>
-								<v-spacer />
-								<v-btn color="primary" v-on:click="uiLogInClick"><v-icon left>mdi-login</v-icon>Login</v-btn>
-							</v-card-actions>
-						</v-card>
-					</v-col>
-				</v-row>
-				
-			</v-container>
-		
-		
-			<v-container fluid v-if="UI.isLoggedIn">
-			
-				<v-row v-if="UI.activePage == 'main'">
-					<v-col cols="12" sm="12">
-
-						<v-card width="100%" outlined>
-
-							<v-card-title>Home</v-card-title>
-
-						</v-card>
-
-					</v-col>
-
-				</v-row>
-				
-				
-				<v-row v-if="UI.activePage == 'builds'">
-					<v-col cols="12" sm="12">
-
-						<v-card width="100%" outlined>
-
-							<v-card-title>Builds</v-card-title>
-
-								 <form enctype="multipart/form-data" novalidate v-if="uploadIsInitial || uploadIsSaving">							
-									<div class="dropbox">
-									  <input type="file" multiple :name="uploadFieldName" :disabled="uploadIsSaving" @change="uploadFilesChange($event.target.name, $event.target.files); fileCount = $event.target.files.length"
-										accept="" class="input-file">
-										<p v-if="uploadIsInitial">
-										  Drag your build file here to begin or click to browse
-										</p>
-										<p v-if="uploadIsSaving">
-										  Uploading {{ fileCount }} files...
-										</p>
-									</div>
-								  </form>
-
-								<v-data-table
-												:headers="Builds.Headers"
-												:items="Builds.Items"
-												:items-per-page="15"
-												class="elevation-1"
-												width="100%"
-												loadingText="Loading... Please wait"
-												>
-
-										</v-data-table>
-
-						</v-card>
-				
-					</v-col>
-
-				</v-row>
-
-				<v-row v-if="(UI.activePage == 'states') && (UI.activeSubPage == '')">
-					<v-col cols="12" sm="12">
-
-						<v-card width="100%" outlined>
-
-							<v-card-title>Machine Status</v-card-title>
-							
-										<v-data-table
-												:headers="Parameters.Headers"
-												:items="Parameters.Items"
-												:items-per-page="15"
-												class="elevation-1"
-												disable-pagination
-												hide-default-footer
-												width="100%"
-												loadingText="Loading... Please wait"
-												>
-
-										</v-data-table>
-							
-						</v-card>
-
-						<v-card width="100%" outlined>
-
-							<v-card-title>Subsystems</v-card-title>
-							
-							<v-list>
-							
-								<v-list-item-group color="primary">
-								
-									<v-list-item v-for="(instance, i) in Data.instanceList" :key="i">								
-									
-										<v-list-item-content> {{ instance.description }}</v-list-item-content>
-									
-									</v-list-item>
-								
-								</v-list-item-group>
-							
-							</v-list>
-							
-							
-						</v-card>
-
-						
-					</v-col>
-					
-				</v-row>
-					
-				<v-row v-if="(UI.activePage == 'states') && (UI.activeSubPage != '')">
-					
-					<v-col cols="12" sm="12">
-
-						<v-card width="100%" outlined>
-
-							<v-card-title>{{ Data.instanceMap[this.UI.activeSubPage].description }}: {{ UI.activePageStatus }}</v-card-title>
-
-						<div id="paper">
-
-						</div>		
-
-						<v-btn class="ms-2" color="primary" large v-on:click="drawGraph ()">
-							<v-icon left>mdi-refresh</v-icon>
-							Draw Graph
-						</v-btn>
-
-						</v-card>
-				
-					</v-col>
-
-				</v-row>
-
-
-				<v-row v-if="UI.activePage == 'settings'">
-					<v-col cols="12" sm="12">
-
-						<v-card width="100%" outlined>
-
-							<v-card-title>Settings</v-card-title>
-
-						</v-card>
-				
-					</v-col>
-
-				</v-row>
-
-
-
-				<v-row v-if="UI.activePage == 'logs'">
-					<v-col cols="12" sm="12">
-
-						<v-card width="100%" outlined>
-
-							<v-card-title>Logs</v-card-title>
-
-							<v-container fluid>
-								<v-row>
-									<v-col
-											cols="12"
-											sm="2"
-											align="left">
-										<v-card flat>
-											<v-switch
-													v-model="Logs.AutoUpdate"
-													:label="'Automatic Update'">
-											</v-switch>	  
-										</v-card>
-									</v-col>
-									<v-col cols="12" sm="6">
-										<v-card flat>
-											<v-alert dense outlined type="error" v-if="logsError" color="primary">
-												Could not retrieve machine logs!
-											</v-alert>				
-										</v-card>
-									</v-col>
-									<v-col
-											cols="12"
-											sm="4"
-											align="right">
-
-										<v-card flat>
-
-
-											<v-btn class="ms-2" color="primary" large v-on:click="uiLogsDownload">
-												<v-icon left>mdi-download</v-icon>
-												Download
-											</v-btn>
-											<v-btn class="ms-2" color="primary" large v-on:click="uiLogsReset">
-												<v-icon left>mdi-refresh</v-icon>
-												Reload
-											</v-btn>
-										</v-card>
-									</v-col>
-								</v-row>
-								<v-row>
-									<v-col
-											cols="12"
-											sm="12"
-											>
-										<v-card>
-
-											<v-data-table
-													:headers="Logs.Headers"
-													:items="Logs.Items"
-													:items-per-page="15"
-													disable-pagination
-													class="elevation-1"
-													dense
-													disable-sort
-													width="100%"
-													loadingText="Loading... Please wait"
-													loading="!logsAvailable"
-													>
-
-											</v-data-table>
-
-										</v-card>
-									</v-col>
-								</v-row>
-							</v-container>
-
-
-						</v-card>
-				
-					</v-col>
-
-				</v-row>
-
-			</v-container>
-		</v-content>
-
-		<v-footer
-				color="primary"
-				class="text-right"
-				app	  
-				>
-			<v-spacer/>
-			<span class="caption white--text">&copy; {{ UI.textCopyRight }}</span>
-		</v-footer>	
-
-	</v-app>
+<v-app id="inspire">
+    <v-navigation-drawer v-if="appIsReady" v-model="AppState.showDrawer" clipped :clipped-left="$vuetify.breakpoint.lgAndUp" disable-resize-watcher app>
+        <v-list dense>
+            <template v-for="item in AppDefinition.MenuItems">
+                <v-list-group v-if="item.children" :key="item.caption" v-model="item.model" :prepend-icon="item.model ? item.icon : item['icon-alt']">
+                    <template v-slot:activator>
+                        <v-list-item-content>
+                            <v-list-item-title v-on:click.stop="uiChangePage(item.targetpage)">
+                                {{ item.caption }}
+                            </v-list-item-title>
+                        </v-list-item-content>
+                    </template>
+
+                    <v-list-item v-for="(child, i) in item.children" :key="i" link v-on:click.stop="uiChangePage(child.targetPage)">
+                        <v-list-item-action v-if="child.icon">
+                            <v-icon>{{ child.icon }}</v-icon>
+                        </v-list-item-action>
+                        <v-list-item-content>
+                            <v-list-item-title>
+                                {{ child.text }}
+                            </v-list-item-title>
+                        </v-list-item-content>
+                    </v-list-item>
+                </v-list-group>
+
+                <v-list-item v-else :key="item.caption" link v-on:click.stop="uiChangePage(item.targetpage)">
+                    <v-list-item-action>
+                        <v-icon>{{ item.icon }}</v-icon>
+                    </v-list-item-action>
+                    <v-list-item-content>
+                        <v-list-item-title>
+                            {{ item.caption }}
+                        </v-list-item-title>
+                    </v-list-item-content>
+                </v-list-item>
+            </template>
+        </v-list>
+    </v-navigation-drawer>
+
+    <v-app-bar app color="primary" dark v-if="appIsReady" :clipped-left="$vuetify.breakpoint.lgAndUp">
+        <v-app-bar-nav-icon v-on:click.stop="uiToggleDrawer" />
+        <v-btn tile large color="primary" dark v-on:click.stop="uiChangePage('main')">
+            {{ uiButtonCaptionCheck(AppDefinition.TextApplicationName) }}
+        </v-btn>
+
+        <v-spacer />
+
+        <template v-for="toolbaritem in AppDefinition.ToolbarItems">
+            <v-btn :key="toolbaritem.id" color="primary" large v-on:click.stop="uiChangePage(toolbaritem.targetpage)">
+                <v-icon left>{{ toolbaritem.icon }}</v-icon>{{ uiButtonCaptionCheck(toolbaritem.caption) }}
+            </v-btn>
+        </template>
+    </v-app-bar>
+
+    <v-main>
+        <v-container class="fill-height" fluid v-if="appIsLoading">
+            <v-row align="center" justify="center">
+                <v-progress-circular :value="20" indeterminate="true"></v-progress-circular>
+            </v-row>
+        </v-container>
+
+        <v-container class="fill-height" fluid v-if="appIsLogin">
+            <v-row align="center" justify="center">
+                <v-col cols="12" sm="8" md="4">
+                    <v-card class="elevation-12">
+                        <v-toolbar color="primary" dark flat>
+                            <v-toolbar-title>{{ AppDefinition.TextApplicationName }}</v-toolbar-title>
+                        </v-toolbar>
+                        <v-card-text>
+                            <v-form>
+                                <v-text-field label="User" name="login" prepend-icon="mdi-account" type="text" v-model="AppState.uiLoginUser" autofocus clearable />
+                                <v-text-field id="password" label="Password" name="password" prepend-icon="mdi-lock" type="password" clearable v-model="AppState.uiLoginPassword" />
+                            </v-form>
+                        </v-card-text>
+                        <v-card-actions>
+                            <v-spacer />
+                            <v-btn color="primary" v-on:click="uiLogInClick">
+                                <v-icon left>mdi-login</v-icon>Login
+                            </v-btn>
+                        </v-card-actions>
+                    </v-card>
+                </v-col>
+            </v-row>
+        </v-container>
+
+        <v-container class="fill-height" fluid v-if="appIsError">
+            <v-row align="center" justify="center">
+                <v-col cols="12" sm="8" md="4">
+                    <v-card class="elevation-12">
+                        <v-toolbar color="primary" dark flat>
+                            <v-toolbar-title>Fatal error</v-toolbar-title>
+                        </v-toolbar>
+                        <v-card-text>
+                            Could not connect to server. Please try again later!
+                        </v-card-text>
+                        <v-card-actions>
+                            <v-spacer />
+                            <v-btn color="primary" v-on:click="uiReloadPageClick">
+                                <v-icon left>mdi-refresh</v-icon>Reload page
+                            </v-btn>
+                        </v-card-actions>
+                    </v-card>
+                </v-col>
+            </v-row>
+        </v-container>
+
+        <v-container fluid v-if="appIsReady"> </v-container>
+    </v-main>
+
+    <v-footer color="primary" class="text-right" min-height="30" app >
+        <v-spacer />
+        <span class="caption white--text" v-if="appHasInformation">&copy; {{ AppDefinition.TextCopyRight }}</span>		
+    </v-footer>
+</v-app>
 </template>
 
-
-
 <script>
+import * as Axios from "axios";
 
-  import axios from "axios";
-  import Dracula from 'graphdracula'
-  
-  export default {
+export default {
     props: {
-      source: String,
+        source: String
+    },
+
+    created() {
+        this.AppState.globalTimer = setInterval(this.uiOnTimer, 600);
+
+        if (process.env.NODE_ENV == "development") {
+            this.API.baseURL = "http://localhost:8869/api";
+        }
+
+        this.appRetrieveConfiguration();
+    },
+
+    beforeDestroy() {
+        if (this.AppState.globalTimer != "") {
+            clearInterval(this.AppState.globalTimer);
+        }
+    },
+
+    computed: {
+        appIsLoading() {
+            return this.AppState.currentStatus === "initial";
+        },
+
+        appIsLogin() {
+            return this.AppState.currentStatus === "login";
+        },
+
+        appIsReady() {
+            return this.AppState.currentStatus === "ready";
+        },
+
+        appIsError() {
+            return this.AppState.currentStatus === "error";
+        },
+
+		appHasInformation() {
+			return (this.AppState.currentStatus === "login") || (this.AppState.currentStatus === "ready");
+		} 
     },
-	
-	created () {
-		this.UI.uiTimer = setInterval (this.uiOnTimer, 600);
-							
-		this.Graph = Dracula.Graph
-		this.Renderer = Dracula.Renderer.Raphael
-		this.Layout = Dracula.Layout.Spring
-		
-		if (process.env.NODE_ENV == "development") {
-			this.API.baseURL = "http://localhost:8869/api";
-		}
-		
-		this.dataRetrieveSetup ();
-									
-	},	
-	
-	beforeDestroy() {
-			if (this.UI.uiTimer != '') {
-				clearInterval (this.UI.uiTimer);
-			}
-	},
-	
-	computed: {
-		
-		logsAvailable: function () {
-			return (this.Logs.LastID > 0);
-		
-		},
-		
-		logsError: function () {
-			return (this.Logs.ErrorCount > 5);
-		},
-		
-        uploadIsInitial() {
-          return this.Upload.currentStatus == "initial";
+
+    methods: {
+        appRetrieveConfiguration() {
+            var url = this.API.baseURL + "/ui/config";
+            Axios({
+                    method: "GET",
+                    url: url
+                })
+                .then(resultJSON => {
+                    this.AppDefinition.TextApplicationName = resultJSON.data.appname;
+                    this.AppDefinition.TextCopyRight = resultJSON.data.copyright;
+                    this.AppDefinition.MainPage = resultJSON.data.mainpage;
+                    this.AppDefinition.MenuItems = resultJSON.data.menuitems;
+                    this.AppDefinition.ToolbarItems = resultJSON.data.toolbaritems;
+                    this.AppState.currentStatus = "login";
+                })
+                .catch(err => {
+                    this.AppState.currentStatus = "error";
+                    this.AppState.currentError = err.response;
+                });
+        },
+
+        uiLogInClick() {
+            this.AppState.uiLoginPassword = "";
+            this.AppState.currentStatus = "ready";
+        },
+
+        uiReloadPageClick() {
+            this.AppState.currentStatus = "initial";
+            this.appRetrieveConfiguration();
         },
-        uploadIsSaving() {
-          return this.Upload.currentStatus == "saving";
+
+        uiButtonCaptionCheck(caption) {
+            var size = this.$vuetify.breakpoint.name;
+            if (size == "xs" || size == "sm") return "";
+
+            return caption;
+        },
+
+        uiToggleDrawer() {
+            this.AppState.showDrawer = !this.AppState.showDrawer;
         },
-        uploadIsSuccess() {
-          return this.Upload.currentStatus == "success";
+
+        uiChangePage(page) {
+            this.AppState.activePage = page;
         },
-        uploadIsFailed() {
-          return this.Upload.currentStatus == "failed";
-        }		
-		
-		
-	},
-		
-	methods: {
-	
-		uiLogInClick () {
-			
-			this.UI.uiLoginPassword = "";
-			
-			this.UI.isLoggedIn = true;
-		
-		},
-		
-		
-		uiButtonCaptionCheck (caption) {
-		
-			var size = this.$vuetify.breakpoint.name;
-			if ((size == "xs") || (size == "sm")) 
-				return "";
-				
-			return caption;
-		},
-	
-		uiToggleDrawer () {
-			this.UI.showDrawer = !this.UI.showDrawer;
-		},
-				
-		uiChangePage (page, subpage) {		
-			this.UI.activePage = page;			
-			if (subpage) {
-				this.UI.activeSubPage = subpage;
-			} else {
-				this.UI.activeSubPage = "";
-			}
-			
-			if (page == 'logs') {
-				this.retrieveLogs();
-			}
-			
-			this.uiUpdateActivePageStatus ();
-			
-		},
-		
-		uiOnTimer () {
-			if (this.Logs.AutoUpdate) {
-				this.retrieveLogs();		
-			}
-			
-			this.dataRetrieveStatus();
-		},
-
-		uiLogsReset () {
-			this.Logs.Items = [];
-			this.Logs.LastID = 0;
-			this.Logs.ErrorCount = 0;
-			this.retrieveLogs();		
-		},
-		
-		uiLogsDownload () {		
-		
-		
-		},
-		
-		uiUpdateActivePageStatus ()
-		{
-			if (this.UI.activeSubPage != "") {
-				this.UI.activePageStatus = this.Data.instanceStatus[this.UI.activeSubPage];
-			} else {
-				this.UI.activePageStatus = "";
-			}
-		},
-		
-		
-		uploadReset () {
-			this.Upload.currentStatus = "initial";
-			this.Upload.uploadedFiles = [];
-			this.Upload.uploadError = null;
-		},
-		
-		
-		
-		uploadSave (formData) {
-        
-			this.Upload.currentStatus = 'saving';
-			formData.teset = 4;
-
-			//upload(formData)
-//				.then(x => {
-					//this.uploadedFiles = [].concat(x);
-					//this.currentStatus = STATUS_SUCCESS;
-//				})
-				//.catch(err => {
-//					this.uploadError = err.response;
-					//this.currentStatus = STATUS_FAILED;
-				//});
-				
-		},
-		
-		uploadFilesChange (fieldName, fileList) {
-
-			const formData = new FormData();
-			if (!fileList.length) 
-				return;
-
-			// append the files to FormData
-			Array
-				.from(Array(fileList.length).keys())
-				.map(x => {
-					formData.append(fieldName, fileList[x], fileList[x].name);
-				});
-
-			// save it
-			this.uploadSave(formData);
-		},
-		
-		
-		
-		dataRetrieveSetup () {
-			var url = this.API.baseURL + "/setup/";	
-			axios({ method: "GET", "url": url }).then(result => {
-			
-				var instances = result.data.instances;
-				if (instances) {
-				
-				
-					var Sections = [];
-					this.UI.MenuItems[2].children = Sections;
-					
-					var instanceCount = instances.length;
-					for (var instanceIdx = 0; instanceIdx < instanceCount; instanceIdx++) {
-						
-						var instance = instances[instanceIdx];
-						
-						var instanceSection = { icon: 'mdi-signal-cellular-outline', text: instance.description, id: instance.name, targetPage: 'states', targetSubPage: instance.name }
-						Sections.push (instanceSection);
-						
-						
-						this.Data.instanceList.push (instance);
-						this.Data.instanceMap[instance.name] = instance;											
-												
-						var parameterGroups = instance.parametergroups;
-						if (parameterGroups) {
-						
-							var groupCount = parameterGroups.length;
-							for (var groupIndex = 0; groupIndex < groupCount; groupIndex++) {
-							
-								var group = parameterGroups[groupIndex];
-								var parameters = group.parameters;
-																
-								if (parameters) {
-																		
-									var paramCount = parameters.length;
-									
-									for (var paramIdx = 0; paramIdx < paramCount; paramIdx++) {
-										
-										var parameter = parameters[paramIdx];
-										var dataParam =
-										{
-											parameterName: parameter.name,
-											parameterDesc: parameter.description,
-											parameterGroup: group.name,
-											parameterGroupDesc: group.description,
-											parameterValue: "",
-											instanceName: instance.name,
-											instanceDescription: instance.description,
-										}				
-
-										var paramURL = instance.name + "/" + group.name + "/" + parameter.name;
-										this.Data.parameterListMap[paramURL] = dataParam;
-																			
-										this.Parameters.Items.push (dataParam);
-									
-									}								
-								
-								}														
-							
-							}						
-						
-						}
-						
-					}
-									
-				}
-			
-			
-			}, error => {			
-				console.error(error);
-			});
-			
-		},
-		
-		dataRetrieveStatus () {
-			var url = this.API.baseURL + "/status/";	
-			axios({ method: "GET", "url": url }).then(result => {
-			
-				var instances = result.data.instances;
-				if (instances) {
-				
-									
-					var instanceCount = instances.length;
-					for (var instanceIdx = 0; instanceIdx < instanceCount; instanceIdx++) {
-						
-						var instance = instances[instanceIdx];
-																	
-						this.Data.instanceStatus[instance.name] = instance.state;
-												
-						var parameterGroups = instance.parametergroups;
-						if (parameterGroups) {
-						
-							var groupCount = parameterGroups.length;
-							for (var groupIndex = 0; groupIndex < groupCount; groupIndex++) {
-							
-								var group = parameterGroups[groupIndex];
-								var parameters = group.parameters;
-																
-								if (parameters) {
-																		
-									var paramCount = parameters.length;
-									
-									for (var paramIdx = 0; paramIdx < paramCount; paramIdx++) {
-																											
-										var parameter = parameters[paramIdx];
-										var paramURL = instance.name + "/" + group.name + "/" + parameter.name;
-										this.Data.parameterListMap[paramURL].parameterValue = parameter.value;
-																																						
-									}								
-								
-								}														
-							
-							}						
-						
-						}
-						
-					}
-									
-				}
-				
-				
-				this.uiUpdateActivePageStatus ();
-			
-			
-			}, error => {			
-				console.error(error);
-			});
-			
-		},
-		
-		drawGraph () {
-
-			
-					var states = this.Data.instanceMap[this.UI.activeSubPage].states;
-
-
-					var graphData = { graph: {}, layout: {}, renderer: {} };
-					graphData.graph = new this.Graph()
-
-				
-					var stateCount = states.length;
-					var idx;
-					
-					for (idx = 0; idx < stateCount; idx++) {
-						graphData.graph.addNode (states[idx].name);
-						
-						var outstates = states[idx].outstates;
-						if (outstates) {
-							var outstatelen = outstates.length;
-							
-							for (var j = 0; j < outstatelen; j++) {
-								graphData.graph.addEdge (states[idx].name, outstates[j]);
-								
-							}
-						}
-						
-						
-					}
-				
-				
-
-//					graphData.graph.addEdge('Banana', 'Apple')
-
-					graphData.layout = new this.Layout(graphData.graph)
-					
-					var paperDiv = document.getElementById("paper");
-					var graphdivname = "graphpaper";
-					
-					
-					var edgecount = graphData.graph.edges.length;
-					for (idx = 0; idx < edgecount; idx++) {
-						if (graphData.graph.edges[idx].shape) {
-							graphData.graph.edges[idx].shape = null;
-						}
-					}
-					
-					if (paperDiv.childNodes.length > 0) {
-						paperDiv.removeChild (paperDiv.childNodes[0]);
-					}
-					
-					
-					var div = document.createElement(graphdivname);
-					div.style.width = "1000px";
-					div.style.height = "500px";
-					div.style.color = "white";			
-					graphData.element = div;
-
-					paperDiv.appendChild(div);
-					
-					graphData.renderer = new this.Renderer(div, graphData.graph, 1000, 500)
-					graphData.renderer.draw()
-				
-				
-				
-		
-		
-					
-		},
-		
-		
-			retrieveLogs () {
-			
-			
-			
-				var url = this.API.baseURL + "/logs/" + (this.Logs.LastID + 1);	
-				console.log (url);
-				axios({ method: "GET", "url": url }).then(result => {
-												
-				var logs=result.data.logs;
-				
-				if (logs) {
-				
-				var loglen = logs.length;
-				for (var idx = 0; idx < loglen; idx++) {
-					var resultLog = logs[idx];
-				
-					var logitem = {
-						Id: resultLog.id,
-						logDate: resultLog.date,
-						logTime: resultLog.time,
-						subsystem: resultLog.subsystem,
-						logText: resultLog.message										
-					}
-					
-					this.Logs.LastID = resultLog.id;
-					this.Logs.Items.push (logitem);
-				}
-				
-				
-				}
-
-				this.Logs.ErrorCount = 0;
-				
-				
-			}, error => {
-				this.Logs.ErrorCount++;
-			
-				console.error(error);
-			});
-
-		}
-		
-	},
-	
+
+        uiOnTimer() {},
+
+        updateTheme() {
+            // Light theme
+            // this.$vuetify.theme.themes.light.primary = '#4caf50'
+            // Dark theme
+            // this.$vuetify.theme.themes.dark.primary = '#4caf50'
+        }
+    },
+
     data: () => ({
-	
-	  API: {
-		baseURL: "/api"
-	  },
-	
-	  UI: {
-		textApplicationName: "Autodesk Machine Control",
-		textCopyRight: "2020 Autodesk Inc.",
-		
-		isLoggedIn: false,
-		uiLoginUser: "",
-		uiLoginPassword: "",
-		
-		showDrawer: true,
-		activePage: "main", 
-	    activeSubPage: "",	
-		activePageStatus: "",
-		uiTimer: '',
-		
-		MenuItems: [
-			{ icon: 'mdi-apps', text: 'Home', targetPage: 'main' },
-			{ icon: 'mdi-factory', text: 'Builds', targetPage: 'builds' },
-			{
-				icon: 'mdi-speedometer-medium',
-				'icon-alt': 'mdi-speedometer',
-				text: 'Machine Status',
-				model: false,
-				targetPage: 'states',
-				children: [
-				],
-			},
-			{ icon: 'mdi-message-text', text: 'Machine Log', targetPage: 'logs'},
-			{ icon: 'mdi-settings', text: 'Settings', targetPage: 'settings' },
-		],
-		
-		
-	  },
-	  
-	  
-	  Upload: {
-		uploadedFiles: [],
-        uploadError: null,
-        currentStatus: "initial",
-        uploadFieldName: "buildfile"
-	  },
-	  
-	  Data: {
-		instanceList: [	],
-		instanceMap: [	],
-		instanceStatus: [ ],
-		parameterListMap: [ ]
-	  },
-	  
-	  Parameters: {
-
-		Headers: [
-          { text: 'Parameter', value: 'parameterDesc' },
-		  { text: 'Value', value: 'parameterValue' },
-          { text: 'Group', value: 'parameterGroupDesc' },
-		  { text: 'System', value: 'instanceDescription' },
-		  
-        ],
-        Items: [ ],
-		ErrorCount: 0,
-	  },
-
-	  Builds: {
-
-		Headers: [
-          { text: 'Image', value: 'buildImage' },
-          { text: 'Build', value: 'buildName' },
-		  { text: 'File name', value: 'fileName' },
-		  { text: 'Upload time', value: 'uploadTime' },
-		  { text: 'Uploader', value: 'uploadAccount' },
-          { text: 'Layers', value: 'layerCount' },
-		  
-        ],
-        Items: [ ],
-		ErrorCount: 0,
-	  },
-	  
-	  
-	  Logs: {
-	  
-		Headers: [
-          { text: 'Time', value: 'logDate' },
-          { text: 'Date', value: 'logTime' },
-          { text: 'Subsystem', value: 'subsystem' },
-          { text: 'Text', value: 'logText' },
-        ],
-        Items: [ ],
-		LastID: 0,
-		ErrorCount: 0,
-		AutoUpdate: false,
-	  
-	  },
-	  	  	  
-	  
-	  Graph: {},
-	  Renderer: {},
-	  Layout: {},
-	  
-	    	  
-    }),
-  }
-</script>
+        API: {
+            baseURL: "/api"
+        },
 
+        AppDefinition: {
+            TextApplicationName: "",
+            TextCopyRight: "",
+            MainPage: "",
+            PageDefinitions: {},
+            ToolbarItems: [],
+            MenuItems: []
+        },
 
+        AppState: {
+            currentStatus: "initial", // one of "initial" / "login" / "ready" / "error"
+            currentError: "",
+            showDrawer: true,
+            activePage: "",
+            globalTimer: "",
+
+            uiLoginUser: "",
+            uiLoginPassword: ""
+        }
+    })
+};
+</script>
 
 <style lang="scss">
-  .dropbox {
-    outline: 2px dashed grey; /* the dash box */
+.dropbox {
+    outline: 2px dashed grey;
+    /* the dash box */
     outline-offset: -10px;
     color: dimgray;
     padding: auto;
-    min-height: 100px; /* minimum height */
+    min-height: 100px;
+    /* minimum height */
     position: relative;
     cursor: pointer;
-  }
+}
 
-  .input-file {
-    opacity: 0; /* invisible but it's there! */
+.input-file {
+    opacity: 0;
+    /* invisible but it's there! */
     width: 100%;
     height: 100px;
     position: absolute;
     cursor: pointer;
-  }
+}
 
-  .dropbox:hover {
-    background: #f0f0f0; /* when mouse over to the drop zone, change color */
-  }
+.dropbox:hover {
+    background: #f0f0f0;
+    /* when mouse over to the drop zone, change color */
+}
 
-  .dropbox p {
+.dropbox p {
     font-size: 1.2em;
     text-align: center;
     padding: 50px 0;
-  }
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/Client/src/plugins/vuetify.js b/Client/src/plugins/vuetify.js
index ec46adba..e13aae32 100644
--- a/Client/src/plugins/vuetify.js
+++ b/Client/src/plugins/vuetify.js
@@ -1,7 +1,9 @@
 import Vue from 'vue';
 import Vuetify from 'vuetify/lib';
+//import colors from 'vuetify/lib/util/colors'
 
 Vue.use(Vuetify);
 
 export default new Vuetify({
+	
 });
diff --git a/Drivers/CMakeLists.txt b/Drivers/CMakeLists.txt
index 49a6a956..d72db5aa 100644
--- a/Drivers/CMakeLists.txt
+++ b/Drivers/CMakeLists.txt
@@ -19,4 +19,5 @@ project("AMCDrivers")
 
 add_subdirectory(ScanLab)
 add_subdirectory(Marlin)
+add_subdirectory(Camera)
 
diff --git a/Drivers/Camera/ACT/LibMCDriver_Camera.xml b/Drivers/Camera/ACT/LibMCDriver_Camera.xml
new file mode 100644
index 00000000..0ca3f36e
--- /dev/null
+++ b/Drivers/Camera/ACT/LibMCDriver_Camera.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component xmlns="http://schemas.autodesk.com/netfabb/automaticcomponenttoolkit/2018" 
+	libraryname="MC Driver Camera" namespace="LibMCDriver_Camera" copyright="Autodesk Inc." year="2020" basename="libmcdriver_camera"
+	version="1.0.0">
+	<license>
+		<line value="All rights reserved." />
+		<line value="" />
+		<line value="Redistribution and use in source and binary forms, with or without" />
+		<line value="modification, are permitted provided that the following conditions are met:" />
+		<line value="    * Redistributions of source code must retain the above copyright" />
+		<line value="      notice, this list of conditions and the following disclaimer." />
+		<line value="    * Redistributions in binary form must reproduce the above copyright" />
+		<line value="      notice, this list of conditions and the following disclaimer in the" />
+		<line value="      documentation and/or other materials provided with the distribution." />
+		<line value="    * Neither the name of the Autodesk Inc. nor the" />
+		<line value="      names of its contributors may be used to endorse or promote products" />
+		<line value="      derived from this software without specific prior written permission." />
+		<line value="" />
+		<line value="THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND" />
+		<line value="ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED" />
+		<line value="WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE" />
+		<line value="DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY" />
+		<line value="DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES" />
+		<line value="(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;" />
+		<line value="LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND" />
+		<line value="ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT" />
+		<line value="(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS" />
+		<line value="SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." />
+		<line value="" />
+	</license>
+	
+	<bindings>
+		<binding language="CppDynamic" indentation="tabs" />
+	</bindings>
+	<implementations>
+		<implementation language="Cpp" indentation="tabs"/>
+	</implementations>
+	
+	
+	<importcomponent uri="../../../ACT/LibMCDriverEnv.xml" namespace="LibMCDriverEnv"/>
+	
+	<errors>
+		<error name="NOTIMPLEMENTED" code="1" description="functionality not implemented" />
+		<error name="INVALIDPARAM" code="2" description="an invalid parameter was passed" />
+		<error name="INVALIDCAST" code="3" description="a type cast failed" />
+		<error name="BUFFERTOOSMALL" code="4" description="a provided buffer is too small" />
+		<error name="GENERICEXCEPTION" code="5" description="a generic exception occurred" />
+		<error name="COULDNOTLOADLIBRARY" code="6" description="the library could not be loaded" />
+		<error name="COULDNOTFINDLIBRARYEXPORT" code="7" description="a required exported symbol could not be found in the library" />
+		<error name="INCOMPATIBLEBINARYVERSION" code="8" description="the version of the binary interface does not match the bindings interface" />
+		<error name="INVALIDSTATENAME" code="9" description="invalid state name" />
+
+		<error name="DRIVERERROR" code="1000" description="a driver error occured" />		
+		<error name="ITERATORERROR" code="1001" description="iterator does not point at valid object." />		
+		
+	</errors>
+
+	
+<!--
+
+This base Driver interface MUST be in Sync with LibMCDriver.xml
+
+-->
+	
+	<class name="Base">
+	</class>
+	
+	<class name="Driver" parent="Base" description="An abstract Machine Control Driver">
+	
+		<method name="GetName" description = "returns the name identifier of the driver">
+			<param name="Name" type="string" pass="return" description="Name of the driver." />
+		</method>
+
+		<method name="GetType" description = "returns the type identifier of the driver">
+			<param name="Type" type="string" pass="return" description="Type of the driver." />
+		</method>
+
+		<method name="GetVersion" description = "returns the version identifiers of the driver">
+			<param name="Major" type="uint32" pass="out" description="Major version." />
+			<param name="Minor" type="uint32" pass="out" description="Minor version." />
+			<param name="Micro" type="uint32" pass="out" description="Micro version." />
+			<param name="Build" type="string" pass="out" description="Build identifier." />
+		</method>
+
+		<method name="GetHeaderInformation" description = "returns the header information">
+			<param name="NameSpace" type="string" pass="out" description="NameSpace of the driver." />
+			<param name="BaseName" type="string" pass="out" description="BaseName of the driver." />
+		</method>
+	
+	</class>
+
+<!--
+
+End Interface
+
+-->
+
+
+<!--
+
+Custom implementation
+
+-->
+
+	<enum name="ImagePixelFormat">
+		<option name="Unknown" value="0" />
+		<option name="RGB32" value="1" />
+		<option name="Grayscale32" value="2" />
+	</enum>
+
+	<class name="Iterator" parent="Base">
+		<method name="MoveNext" description="Iterates to the next resource in the list.">
+			<param name="HasNext" type="bool" pass="return" description="Iterates to the next resource in the list."/>
+		</method>
+		<method name="MovePrevious" description="Iterates to the previous resource in the list.">
+			<param name="HasPrevious" type="bool" pass="return" description="Iterates to the previous resource in the list."/>
+		</method>
+		<method name="GetCurrent" description="Returns the resource the iterator points at.">
+			<param name="CurrentInstance" type="handle" class="Base" pass="return" description="returns the resource instance."/>
+		</method>
+		<method name="Clone" description="Creates a new resource iterator with the same resource list.">
+			<param name="OutIterator" type="handle" class="Iterator" pass="return" description="returns the cloned Iterator instance"/>
+		</method>
+		<method name="Count" description="Returns the number of resources the iterator captures.">
+			<param name="Count" type="uint64" pass="return" description="returns the number of resources the iterator captures."/>
+		</method>
+	</class>
+
+	<class name="PNGImage" parent="Base" description="A container for PNG images.">
+	
+		<method name="GetWidth" description="Returns width of the image.">
+			<param name="Width" type="uint64" pass="return" description="width of the image in pixels."/>
+		</method>
+		
+		<method name="GetHeight" description="Returns height of the image.">
+			<param name="Height" type="uint64" pass="return" description="height of the image in pixels."/>
+		</method>
+		
+		<method name="GetPixelFormat" description="Returns pixel format of the image.">
+			<param name="Pixelformat" type="enum" class="ImagePixelFormat" pass="return" description="Pixel format of the image." />
+		</method>
+		
+		<method name="GetRawData" description="Returns raw data of the image.">
+			<param name="PNGData" type="basicarray" class="uint8" pass="out" description="Binary data of PNG image captured." />
+		</method>
+
+		<method name="SaveToFile" description="Saves PNG Image on Disk.">
+			<param name="FileName" type="string" pass="return" description="Filename to save PNG to." />
+		</method>
+		
+	</class>
+
+
+	<class name="Driver_Camera" parent="Driver" description="A Driver for a RGB camera in the system.">
+
+		<method name="CapturePNGImage" description="Captures an image from the camera and returns a PNG image.">
+		
+			<param name="PNGImage" type="class" class="PNGImage" pass="return" description="Instance of the PNG Image." />
+		
+		</method>
+
+	</class>
+
+
+	<class name="RaspiCameraDevice" parent="Base" description="A found device on the Raspberry PI.">
+	
+		<method name="GetDeviceString" description="Returns path to the camera device.">
+			<param name="DeviceString" type="string" pass="return" description="Path to camera device." />
+		</method>
+		
+	</class>
+	
+	<class name="RaspiCameraDeviceIterator" parent="Iterator">
+		<method name="GetCameraDevice" description="Returns the camera device the iterator points at.">
+			<param name="CurrentInstance" type="handle" class="RaspiCameraDevice" pass="return" description="returns the camera device instance."/>
+		</method>
+	</class>	
+
+
+	<class name="Driver_RaspiCamera" parent="Driver_Camera" description="A Driver for the raspberry Pi camera.">
+
+		<method name="QueryDevices" description="Looks for cameras on the Raspberry PI.">
+			<param name="DeviceIterator" type="class" class="RaspiCameraDeviceIterator" pass="return" description="Iterator Instance through all found devices." />
+		</method>
+
+
+		<method name="Initialize" description="Initialize the camera on the Raspberry PI.">
+			<param name="DeviceString" type="string" pass="in" description="Path to camera device." />
+			<param name="Width" type="uint32" pass="in" description="Width of Image in Pixels." />
+			<param name="Height" type="uint32" pass="in" description="Height of Image in Pixels." />
+			<param name="Pixelformat" type="enum" class="ImagePixelFormat" pass="in" description="Pixel format of the image." />
+		</method>
+
+	</class>
+
+
+<!--
+
+End of Custom implementation
+
+-->
+
+		
+	<global baseclassname="Base" stringoutclassname="Base" releasemethod="ReleaseInstance" acquiremethod="AcquireInstance" versionmethod="GetVersion" errormethod="GetLastError" injectionmethod="InjectComponent" symbollookupmethod="GetSymbolLookupMethod">
+		
+		<method name="GetVersion" description = "retrieves the binary version of this library.">
+			<param name="Major" type="uint32" pass="out" description="returns the major version of this library" />
+			<param name="Minor" type="uint32" pass="out" description="returns the minor version of this library" />
+			<param name="Micro" type="uint32" pass="out" description="returns the micro version of this library" />
+		</method>
+		<method name="GetLastError" description="Returns the last error recorded on this object">
+			<param name="Instance" type="class" class="Base" pass="in" description="Instance Handle" />
+			<param name="ErrorMessage" type="string" pass="out" description="Message of the last error" />
+			<param name="HasError" type="bool" pass="return" description="Is there a last error to query" />
+		</method>
+		<method name="ReleaseInstance" description="Releases shared ownership of an Instance">
+			<param name="Instance" type="class" class="Base" pass="in" description="Instance Handle" />
+		</method>
+		<method name="AcquireInstance" description="Acquires shared ownership of an Instance">
+			<param name="Instance" type="class" class="Base" pass="in" description="Instance Handle" />
+		</method>
+		<method name="InjectComponent" description="Injects an imported component for usage within this component">
+			<param name="NameSpace" type="string" pass="in" description="NameSpace of the injected component" />
+			<param name="SymbolAddressMethod" type="pointer" pass="in" description="Address of the SymbolAddressMethod of the injected component" />
+		</method>		
+		<method name="GetSymbolLookupMethod" description="Returns the address of the SymbolLookupMethod">
+			<param name="SymbolLookupMethod" type="pointer" pass="return" description="Address of the SymbolAddressMethod" />
+		</method>				
+		<method name="CreateDriver" description="Creates a driver instance with a specific name.">
+			<param name="Name" type="string" pass="in" description="Name of driver to be created." />
+			<param name="Type" type="string" pass="in" description="Type of driver to be created." />
+			<param name="DriverEnvironment" type="class" class="LibMCDriverEnv:DriverEnvironment" pass="in" description="Environment of this driver." />
+			<param name="Instance" type="class" class="Driver" pass="return" description="New Driver instance" />
+		</method>
+		
+	</global>
+	
+	
+</component>
+
+
diff --git a/Drivers/Camera/ACT/generateInterfaces.bat b/Drivers/Camera/ACT/generateInterfaces.bat
new file mode 100644
index 00000000..48594f6f
--- /dev/null
+++ b/Drivers/Camera/ACT/generateInterfaces.bat
@@ -0,0 +1,3 @@
+..\..\..\ACT\act.exe LibMCDriver_Camera.xml -bindings ..\Headers -interfaces ..\Interfaces -suppresssubcomponents -suppresslicense -suppressstub -suppressexamples
+
+pause
\ No newline at end of file
diff --git a/Drivers/Camera/CMakeLists.txt b/Drivers/Camera/CMakeLists.txt
new file mode 100644
index 00000000..57df25bd
--- /dev/null
+++ b/Drivers/Camera/CMakeLists.txt
@@ -0,0 +1,126 @@
+#[[++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+]]
+
+
+cmake_minimum_required(VERSION 3.5)
+
+##########################################################################################
+### Change the next line for making a new driver
+##########################################################################################
+
+set (DRIVERPROJECT Camera)
+
+##########################################################################################
+### generic CMake boilerplate code
+##########################################################################################
+
+project(LibMCDriver_${DRIVERPROJECT})
+
+string(TOLOWER ${DRIVERPROJECT} DRIVERSUFFIX)
+string(TOUPPER ${DRIVERPROJECT} DRIVERSUFFIX_UPPER)
+
+set (DRIVERNAME libmcdriver_${DRIVERSUFFIX})
+
+set (EXPORTFLAG __LIBMCDRIVER_${DRIVERSUFFIX_UPPER}_EXPORTS)
+
+set (CMAKE_CXX_STANDARD 14)
+
+# The location of autogenerated interfaces
+set(CMAKE_CURRENT_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/HeadersDev/CppDynamic)
+set(CMAKE_CURRENT_AUTOGENERATED_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/InterfacesDev)
+set(CMAKE_CURRENT_OUTPUT_DIR ${PROJECT_BINARY_DIR}/../../Output)
+
+file(STRINGS ${PROJECT_BINARY_DIR}/../../githash.txt GLOBALGITHASH)
+message(STATUS "Global git hash: \"${GLOBALGITHASH}\"")
+
+
+file(GLOB LIBMCDRIVER_SRC
+	${CMAKE_CURRENT_SOURCE_DIR}/Interfaces/*.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/Implementation/*.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/Implementation/serial/*.cc
+)
+
+add_library(${DRIVERNAME} SHARED ${LIBMCDRIVER_SRC})
+# Do not prefix the binary's name with "lib" on Unix systems:
+set_target_properties(${DRIVERNAME} PROPERTIES PREFIX "" IMPORT_PREFIX "" )
+# The following two properties are crucial to reduce the number of undesirably exported symbols
+set_target_properties(${DRIVERNAME} PROPERTIES CXX_VISIBILITY_PRESET hidden)
+set_target_properties(${DRIVERNAME} PROPERTIES VISIBILITY_INLINES_HIDDEN ON)
+# This makes sure symbols are exported
+target_compile_options(${DRIVERNAME} PRIVATE "-D${EXPORTFLAG}")
+target_compile_options(${DRIVERNAME} PRIVATE "-D__LIBMCDRIVER_EXPORTS")
+target_include_directories(${DRIVERNAME} PRIVATE ${CMAKE_CURRENT_AUTOGENERATED_DIR})
+target_include_directories(${DRIVERNAME} PRIVATE ${CMAKE_CURRENT_HEADER_DIR})
+target_include_directories(${DRIVERNAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Implementation)
+target_include_directories(${DRIVERNAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Interfaces)
+
+set_target_properties(${DRIVERNAME}
+    PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_OUTPUT_DIR}"
+    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_OUTPUT_DIR}"
+    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_OUTPUT_DIR}"
+	LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_OUTPUT_DIR}"
+	ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_OUTPUT_DIR}"
+	VS_DEBUGGER_COMMAND "${CMAKE_CURRENT_OUTPUT_DIR}/amc_server.exe"
+	VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_OUTPUT_DIR}"	
+	OUTPUT_NAME "${GLOBALGITHASH}_driver_${DRIVERSUFFIX}"	
+)
+
+
+##########################################################################################
+### Copy driver header files
+##########################################################################################
+
+file (GLOB headerfiles LIST_DIRECTORIES false "${CMAKE_CURRENT_SOURCE_DIR}/Headers/CppDynamic/*.h*")
+foreach(headerfile ${headerfiles})
+
+	get_filename_component(headerfilename ${headerfile} NAME)
+	
+	add_custom_command(
+        TARGET ${DRIVERNAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "copying ${headerfile}...")
+
+	add_custom_command(
+        TARGET ${DRIVERNAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+                ${headerfile}
+                ${CMAKE_CURRENT_BINARY_DIR}/../../DevPackage/Framework/HeadersDriver/CppDynamic/${headerfilename})
+				
+				
+endforeach()	
+
+
+##########################################################################################
+### Add custom code below
+##########################################################################################
+
+
+
+
diff --git a/Drivers/Camera/Headers/CppDynamic/libmcdriver_camera_abi.hpp b/Drivers/Camera/Headers/CppDynamic/libmcdriver_camera_abi.hpp
new file mode 100644
index 00000000..305af7ff
--- /dev/null
+++ b/Drivers/Camera/Headers/CppDynamic/libmcdriver_camera_abi.hpp
@@ -0,0 +1,361 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file in order to allow an easy
+ use of MC Driver Camera
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDRIVER_CAMERA_HEADER_CPP
+#define __LIBMCDRIVER_CAMERA_HEADER_CPP
+
+#ifdef __LIBMCDRIVER_CAMERA_EXPORTS
+#ifdef _WIN32
+#define LIBMCDRIVER_CAMERA_DECLSPEC __declspec (dllexport)
+#else // _WIN32
+#define LIBMCDRIVER_CAMERA_DECLSPEC __attribute__((visibility("default")))
+#endif // _WIN32
+#else // __LIBMCDRIVER_CAMERA_EXPORTS
+#define LIBMCDRIVER_CAMERA_DECLSPEC
+#endif // __LIBMCDRIVER_CAMERA_EXPORTS
+
+#include "libmcdriver_camera_types.hpp"
+
+#include "libmcdriverenv_dynamic.hpp"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*************************************************************************************************************************
+ Class definition for Base
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for Driver
+**************************************************************************************************************************/
+
+/**
+* returns the name identifier of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_driver_getname(LibMCDriver_Camera_Driver pDriver, const LibMCDriver_Camera_uint32 nNameBufferSize, LibMCDriver_Camera_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* returns the type identifier of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nTypeBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTypeBuffer -  buffer of Type of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_driver_gettype(LibMCDriver_Camera_Driver pDriver, const LibMCDriver_Camera_uint32 nTypeBufferSize, LibMCDriver_Camera_uint32* pTypeNeededChars, char * pTypeBuffer);
+
+/**
+* returns the version identifiers of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[out] pMajor - Major version.
+* @param[out] pMinor - Minor version.
+* @param[out] pMicro - Micro version.
+* @param[in] nBuildBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBuildNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBuildBuffer -  buffer of Build identifier., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_driver_getversion(LibMCDriver_Camera_Driver pDriver, LibMCDriver_Camera_uint32 * pMajor, LibMCDriver_Camera_uint32 * pMinor, LibMCDriver_Camera_uint32 * pMicro, const LibMCDriver_Camera_uint32 nBuildBufferSize, LibMCDriver_Camera_uint32* pBuildNeededChars, char * pBuildBuffer);
+
+/**
+* returns the header information
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nNameSpaceBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameSpaceNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameSpaceBuffer -  buffer of NameSpace of the driver., may be NULL
+* @param[in] nBaseNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBaseNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBaseNameBuffer -  buffer of BaseName of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_driver_getheaderinformation(LibMCDriver_Camera_Driver pDriver, const LibMCDriver_Camera_uint32 nNameSpaceBufferSize, LibMCDriver_Camera_uint32* pNameSpaceNeededChars, char * pNameSpaceBuffer, const LibMCDriver_Camera_uint32 nBaseNameBufferSize, LibMCDriver_Camera_uint32* pBaseNameNeededChars, char * pBaseNameBuffer);
+
+/*************************************************************************************************************************
+ Class definition for Iterator
+**************************************************************************************************************************/
+
+/**
+* Iterates to the next resource in the list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pHasNext - Iterates to the next resource in the list.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_iterator_movenext(LibMCDriver_Camera_Iterator pIterator, bool * pHasNext);
+
+/**
+* Iterates to the previous resource in the list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pHasPrevious - Iterates to the previous resource in the list.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_iterator_moveprevious(LibMCDriver_Camera_Iterator pIterator, bool * pHasPrevious);
+
+/**
+* Returns the resource the iterator points at.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pCurrentInstance - returns the resource instance.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_iterator_getcurrent(LibMCDriver_Camera_Iterator pIterator, LibMCDriver_Camera_Base * pCurrentInstance);
+
+/**
+* Creates a new resource iterator with the same resource list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pOutIterator - returns the cloned Iterator instance
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_iterator_clone(LibMCDriver_Camera_Iterator pIterator, LibMCDriver_Camera_Iterator * pOutIterator);
+
+/**
+* Returns the number of resources the iterator captures.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pCount - returns the number of resources the iterator captures.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_iterator_count(LibMCDriver_Camera_Iterator pIterator, LibMCDriver_Camera_uint64 * pCount);
+
+/*************************************************************************************************************************
+ Class definition for PNGImage
+**************************************************************************************************************************/
+
+/**
+* Returns width of the image.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[out] pWidth - width of the image in pixels.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_pngimage_getwidth(LibMCDriver_Camera_PNGImage pPNGImage, LibMCDriver_Camera_uint64 * pWidth);
+
+/**
+* Returns height of the image.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[out] pHeight - height of the image in pixels.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_pngimage_getheight(LibMCDriver_Camera_PNGImage pPNGImage, LibMCDriver_Camera_uint64 * pHeight);
+
+/**
+* Returns pixel format of the image.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[out] pPixelformat - Pixel format of the image.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_pngimage_getpixelformat(LibMCDriver_Camera_PNGImage pPNGImage, LibMCDriver_Camera::eImagePixelFormat * pPixelformat);
+
+/**
+* Returns raw data of the image.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[in] nPNGDataBufferSize - Number of elements in buffer
+* @param[out] pPNGDataNeededCount - will be filled with the count of the written elements, or needed buffer size.
+* @param[out] pPNGDataBuffer - uint8 buffer of Binary data of PNG image captured.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_pngimage_getrawdata(LibMCDriver_Camera_PNGImage pPNGImage, const LibMCDriver_Camera_uint64 nPNGDataBufferSize, LibMCDriver_Camera_uint64* pPNGDataNeededCount, LibMCDriver_Camera_uint8 * pPNGDataBuffer);
+
+/**
+* Saves PNG Image on Disk.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[in] nFileNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFileNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFileNameBuffer -  buffer of Filename to save PNG to., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_pngimage_savetofile(LibMCDriver_Camera_PNGImage pPNGImage, const LibMCDriver_Camera_uint32 nFileNameBufferSize, LibMCDriver_Camera_uint32* pFileNameNeededChars, char * pFileNameBuffer);
+
+/*************************************************************************************************************************
+ Class definition for Driver_Camera
+**************************************************************************************************************************/
+
+/**
+* Captures an image from the camera and returns a PNG image.
+*
+* @param[in] pDriver_Camera - Driver_Camera instance.
+* @param[out] pPNGImage - Instance of the PNG Image.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_driver_camera_capturepngimage(LibMCDriver_Camera_Driver_Camera pDriver_Camera, LibMCDriver_Camera_PNGImage * pPNGImage);
+
+/*************************************************************************************************************************
+ Class definition for RaspiCameraDevice
+**************************************************************************************************************************/
+
+/**
+* Returns path to the camera device.
+*
+* @param[in] pRaspiCameraDevice - RaspiCameraDevice instance.
+* @param[in] nDeviceStringBufferSize - size of the buffer (including trailing 0)
+* @param[out] pDeviceStringNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pDeviceStringBuffer -  buffer of Path to camera device., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_raspicameradevice_getdevicestring(LibMCDriver_Camera_RaspiCameraDevice pRaspiCameraDevice, const LibMCDriver_Camera_uint32 nDeviceStringBufferSize, LibMCDriver_Camera_uint32* pDeviceStringNeededChars, char * pDeviceStringBuffer);
+
+/*************************************************************************************************************************
+ Class definition for RaspiCameraDeviceIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the camera device the iterator points at.
+*
+* @param[in] pRaspiCameraDeviceIterator - RaspiCameraDeviceIterator instance.
+* @param[out] pCurrentInstance - returns the camera device instance.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_raspicameradeviceiterator_getcameradevice(LibMCDriver_Camera_RaspiCameraDeviceIterator pRaspiCameraDeviceIterator, LibMCDriver_Camera_RaspiCameraDevice * pCurrentInstance);
+
+/*************************************************************************************************************************
+ Class definition for Driver_RaspiCamera
+**************************************************************************************************************************/
+
+/**
+* Looks for cameras on the Raspberry PI.
+*
+* @param[in] pDriver_RaspiCamera - Driver_RaspiCamera instance.
+* @param[out] pDeviceIterator - Iterator Instance through all found devices.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_driver_raspicamera_querydevices(LibMCDriver_Camera_Driver_RaspiCamera pDriver_RaspiCamera, LibMCDriver_Camera_RaspiCameraDeviceIterator * pDeviceIterator);
+
+/**
+* Initialize the camera on the Raspberry PI.
+*
+* @param[in] pDriver_RaspiCamera - Driver_RaspiCamera instance.
+* @param[in] pDeviceString - Path to camera device.
+* @param[in] nWidth - Width of Image in Pixels.
+* @param[in] nHeight - Height of Image in Pixels.
+* @param[in] ePixelformat - Pixel format of the image.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_driver_raspicamera_initialize(LibMCDriver_Camera_Driver_RaspiCamera pDriver_RaspiCamera, const char * pDeviceString, LibMCDriver_Camera_uint32 nWidth, LibMCDriver_Camera_uint32 nHeight, LibMCDriver_Camera::eImagePixelFormat ePixelformat);
+
+/*************************************************************************************************************************
+ Global functions
+**************************************************************************************************************************/
+
+/**
+* retrieves the binary version of this library.
+*
+* @param[out] pMajor - returns the major version of this library
+* @param[out] pMinor - returns the minor version of this library
+* @param[out] pMicro - returns the micro version of this library
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_getversion(LibMCDriver_Camera_uint32 * pMajor, LibMCDriver_Camera_uint32 * pMinor, LibMCDriver_Camera_uint32 * pMicro);
+
+/**
+* Returns the last error recorded on this object
+*
+* @param[in] pInstance - Instance Handle
+* @param[in] nErrorMessageBufferSize - size of the buffer (including trailing 0)
+* @param[out] pErrorMessageNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pErrorMessageBuffer -  buffer of Message of the last error, may be NULL
+* @param[out] pHasError - Is there a last error to query
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_getlasterror(LibMCDriver_Camera_Base pInstance, const LibMCDriver_Camera_uint32 nErrorMessageBufferSize, LibMCDriver_Camera_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError);
+
+/**
+* Releases shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_releaseinstance(LibMCDriver_Camera_Base pInstance);
+
+/**
+* Acquires shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_acquireinstance(LibMCDriver_Camera_Base pInstance);
+
+/**
+* Injects an imported component for usage within this component
+*
+* @param[in] pNameSpace - NameSpace of the injected component
+* @param[in] pSymbolAddressMethod - Address of the SymbolAddressMethod of the injected component
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_injectcomponent(const char * pNameSpace, LibMCDriver_Camera_pvoid pSymbolAddressMethod);
+
+/**
+* Returns the address of the SymbolLookupMethod
+*
+* @param[out] pSymbolLookupMethod - Address of the SymbolAddressMethod
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_getsymbollookupmethod(LibMCDriver_Camera_pvoid * pSymbolLookupMethod);
+
+/**
+* Creates a driver instance with a specific name.
+*
+* @param[in] pName - Name of driver to be created.
+* @param[in] pType - Type of driver to be created.
+* @param[in] pDriverEnvironment - Environment of this driver.
+* @param[out] pInstance - New Driver instance
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_createdriver(const char * pName, const char * pType, LibMCDriverEnv_DriverEnvironment pDriverEnvironment, LibMCDriver_Camera_Driver * pInstance);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __LIBMCDRIVER_CAMERA_HEADER_CPP
+
diff --git a/Drivers/Camera/Headers/CppDynamic/libmcdriver_camera_dynamic.h b/Drivers/Camera/Headers/CppDynamic/libmcdriver_camera_dynamic.h
new file mode 100644
index 00000000..88b2ef10
--- /dev/null
+++ b/Drivers/Camera/Headers/CppDynamic/libmcdriver_camera_dynamic.h
@@ -0,0 +1,378 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file in order to allow an easy
+ use of MC Driver Camera
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDRIVER_CAMERA_DYNAMICHEADER_CPPTYPES
+#define __LIBMCDRIVER_CAMERA_DYNAMICHEADER_CPPTYPES
+
+#include "libmcdriver_camera_types.hpp"
+
+#include "libmcdriverenv_types.hpp"
+
+
+/*************************************************************************************************************************
+ Class definition for Base
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for Driver
+**************************************************************************************************************************/
+
+/**
+* returns the name identifier of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraDriver_GetNamePtr) (LibMCDriver_Camera_Driver pDriver, const LibMCDriver_Camera_uint32 nNameBufferSize, LibMCDriver_Camera_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* returns the type identifier of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nTypeBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTypeBuffer -  buffer of Type of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraDriver_GetTypePtr) (LibMCDriver_Camera_Driver pDriver, const LibMCDriver_Camera_uint32 nTypeBufferSize, LibMCDriver_Camera_uint32* pTypeNeededChars, char * pTypeBuffer);
+
+/**
+* returns the version identifiers of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[out] pMajor - Major version.
+* @param[out] pMinor - Minor version.
+* @param[out] pMicro - Micro version.
+* @param[in] nBuildBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBuildNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBuildBuffer -  buffer of Build identifier., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraDriver_GetVersionPtr) (LibMCDriver_Camera_Driver pDriver, LibMCDriver_Camera_uint32 * pMajor, LibMCDriver_Camera_uint32 * pMinor, LibMCDriver_Camera_uint32 * pMicro, const LibMCDriver_Camera_uint32 nBuildBufferSize, LibMCDriver_Camera_uint32* pBuildNeededChars, char * pBuildBuffer);
+
+/**
+* returns the header information
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nNameSpaceBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameSpaceNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameSpaceBuffer -  buffer of NameSpace of the driver., may be NULL
+* @param[in] nBaseNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBaseNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBaseNameBuffer -  buffer of BaseName of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraDriver_GetHeaderInformationPtr) (LibMCDriver_Camera_Driver pDriver, const LibMCDriver_Camera_uint32 nNameSpaceBufferSize, LibMCDriver_Camera_uint32* pNameSpaceNeededChars, char * pNameSpaceBuffer, const LibMCDriver_Camera_uint32 nBaseNameBufferSize, LibMCDriver_Camera_uint32* pBaseNameNeededChars, char * pBaseNameBuffer);
+
+/*************************************************************************************************************************
+ Class definition for Iterator
+**************************************************************************************************************************/
+
+/**
+* Iterates to the next resource in the list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pHasNext - Iterates to the next resource in the list.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraIterator_MoveNextPtr) (LibMCDriver_Camera_Iterator pIterator, bool * pHasNext);
+
+/**
+* Iterates to the previous resource in the list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pHasPrevious - Iterates to the previous resource in the list.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraIterator_MovePreviousPtr) (LibMCDriver_Camera_Iterator pIterator, bool * pHasPrevious);
+
+/**
+* Returns the resource the iterator points at.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pCurrentInstance - returns the resource instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraIterator_GetCurrentPtr) (LibMCDriver_Camera_Iterator pIterator, LibMCDriver_Camera_Base * pCurrentInstance);
+
+/**
+* Creates a new resource iterator with the same resource list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pOutIterator - returns the cloned Iterator instance
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraIterator_ClonePtr) (LibMCDriver_Camera_Iterator pIterator, LibMCDriver_Camera_Iterator * pOutIterator);
+
+/**
+* Returns the number of resources the iterator captures.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pCount - returns the number of resources the iterator captures.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraIterator_CountPtr) (LibMCDriver_Camera_Iterator pIterator, LibMCDriver_Camera_uint64 * pCount);
+
+/*************************************************************************************************************************
+ Class definition for PNGImage
+**************************************************************************************************************************/
+
+/**
+* Returns width of the image.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[out] pWidth - width of the image in pixels.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraPNGImage_GetWidthPtr) (LibMCDriver_Camera_PNGImage pPNGImage, LibMCDriver_Camera_uint64 * pWidth);
+
+/**
+* Returns height of the image.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[out] pHeight - height of the image in pixels.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraPNGImage_GetHeightPtr) (LibMCDriver_Camera_PNGImage pPNGImage, LibMCDriver_Camera_uint64 * pHeight);
+
+/**
+* Returns pixel format of the image.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[out] pPixelformat - Pixel format of the image.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraPNGImage_GetPixelFormatPtr) (LibMCDriver_Camera_PNGImage pPNGImage, LibMCDriver_Camera::eImagePixelFormat * pPixelformat);
+
+/**
+* Returns raw data of the image.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[in] nPNGDataBufferSize - Number of elements in buffer
+* @param[out] pPNGDataNeededCount - will be filled with the count of the written elements, or needed buffer size.
+* @param[out] pPNGDataBuffer - uint8 buffer of Binary data of PNG image captured.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraPNGImage_GetRawDataPtr) (LibMCDriver_Camera_PNGImage pPNGImage, const LibMCDriver_Camera_uint64 nPNGDataBufferSize, LibMCDriver_Camera_uint64* pPNGDataNeededCount, LibMCDriver_Camera_uint8 * pPNGDataBuffer);
+
+/**
+* Saves PNG Image on Disk.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[in] nFileNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFileNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFileNameBuffer -  buffer of Filename to save PNG to., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraPNGImage_SaveToFilePtr) (LibMCDriver_Camera_PNGImage pPNGImage, const LibMCDriver_Camera_uint32 nFileNameBufferSize, LibMCDriver_Camera_uint32* pFileNameNeededChars, char * pFileNameBuffer);
+
+/*************************************************************************************************************************
+ Class definition for Driver_Camera
+**************************************************************************************************************************/
+
+/**
+* Captures an image from the camera and returns a PNG image.
+*
+* @param[in] pDriver_Camera - Driver_Camera instance.
+* @param[out] pPNGImage - Instance of the PNG Image.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraDriver_Camera_CapturePNGImagePtr) (LibMCDriver_Camera_Driver_Camera pDriver_Camera, LibMCDriver_Camera_PNGImage * pPNGImage);
+
+/*************************************************************************************************************************
+ Class definition for RaspiCameraDevice
+**************************************************************************************************************************/
+
+/**
+* Returns path to the camera device.
+*
+* @param[in] pRaspiCameraDevice - RaspiCameraDevice instance.
+* @param[in] nDeviceStringBufferSize - size of the buffer (including trailing 0)
+* @param[out] pDeviceStringNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pDeviceStringBuffer -  buffer of Path to camera device., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraRaspiCameraDevice_GetDeviceStringPtr) (LibMCDriver_Camera_RaspiCameraDevice pRaspiCameraDevice, const LibMCDriver_Camera_uint32 nDeviceStringBufferSize, LibMCDriver_Camera_uint32* pDeviceStringNeededChars, char * pDeviceStringBuffer);
+
+/*************************************************************************************************************************
+ Class definition for RaspiCameraDeviceIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the camera device the iterator points at.
+*
+* @param[in] pRaspiCameraDeviceIterator - RaspiCameraDeviceIterator instance.
+* @param[out] pCurrentInstance - returns the camera device instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraRaspiCameraDeviceIterator_GetCameraDevicePtr) (LibMCDriver_Camera_RaspiCameraDeviceIterator pRaspiCameraDeviceIterator, LibMCDriver_Camera_RaspiCameraDevice * pCurrentInstance);
+
+/*************************************************************************************************************************
+ Class definition for Driver_RaspiCamera
+**************************************************************************************************************************/
+
+/**
+* Looks for cameras on the Raspberry PI.
+*
+* @param[in] pDriver_RaspiCamera - Driver_RaspiCamera instance.
+* @param[out] pDeviceIterator - Iterator Instance through all found devices.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraDriver_RaspiCamera_QueryDevicesPtr) (LibMCDriver_Camera_Driver_RaspiCamera pDriver_RaspiCamera, LibMCDriver_Camera_RaspiCameraDeviceIterator * pDeviceIterator);
+
+/**
+* Initialize the camera on the Raspberry PI.
+*
+* @param[in] pDriver_RaspiCamera - Driver_RaspiCamera instance.
+* @param[in] pDeviceString - Path to camera device.
+* @param[in] nWidth - Width of Image in Pixels.
+* @param[in] nHeight - Height of Image in Pixels.
+* @param[in] ePixelformat - Pixel format of the image.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraDriver_RaspiCamera_InitializePtr) (LibMCDriver_Camera_Driver_RaspiCamera pDriver_RaspiCamera, const char * pDeviceString, LibMCDriver_Camera_uint32 nWidth, LibMCDriver_Camera_uint32 nHeight, LibMCDriver_Camera::eImagePixelFormat ePixelformat);
+
+/*************************************************************************************************************************
+ Global functions
+**************************************************************************************************************************/
+
+/**
+* retrieves the binary version of this library.
+*
+* @param[out] pMajor - returns the major version of this library
+* @param[out] pMinor - returns the minor version of this library
+* @param[out] pMicro - returns the micro version of this library
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraGetVersionPtr) (LibMCDriver_Camera_uint32 * pMajor, LibMCDriver_Camera_uint32 * pMinor, LibMCDriver_Camera_uint32 * pMicro);
+
+/**
+* Returns the last error recorded on this object
+*
+* @param[in] pInstance - Instance Handle
+* @param[in] nErrorMessageBufferSize - size of the buffer (including trailing 0)
+* @param[out] pErrorMessageNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pErrorMessageBuffer -  buffer of Message of the last error, may be NULL
+* @param[out] pHasError - Is there a last error to query
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraGetLastErrorPtr) (LibMCDriver_Camera_Base pInstance, const LibMCDriver_Camera_uint32 nErrorMessageBufferSize, LibMCDriver_Camera_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError);
+
+/**
+* Releases shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraReleaseInstancePtr) (LibMCDriver_Camera_Base pInstance);
+
+/**
+* Acquires shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraAcquireInstancePtr) (LibMCDriver_Camera_Base pInstance);
+
+/**
+* Injects an imported component for usage within this component
+*
+* @param[in] pNameSpace - NameSpace of the injected component
+* @param[in] pSymbolAddressMethod - Address of the SymbolAddressMethod of the injected component
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraInjectComponentPtr) (const char * pNameSpace, LibMCDriver_Camera_pvoid pSymbolAddressMethod);
+
+/**
+* Returns the address of the SymbolLookupMethod
+*
+* @param[out] pSymbolLookupMethod - Address of the SymbolAddressMethod
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraGetSymbolLookupMethodPtr) (LibMCDriver_Camera_pvoid * pSymbolLookupMethod);
+
+/**
+* Creates a driver instance with a specific name.
+*
+* @param[in] pName - Name of driver to be created.
+* @param[in] pType - Type of driver to be created.
+* @param[in] pDriverEnvironment - Environment of this driver.
+* @param[out] pInstance - New Driver instance
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_CameraResult (*PLibMCDriver_CameraCreateDriverPtr) (const char * pName, const char * pType, LibMCDriverEnv_DriverEnvironment pDriverEnvironment, LibMCDriver_Camera_Driver * pInstance);
+
+/*************************************************************************************************************************
+ Function Table Structure
+**************************************************************************************************************************/
+
+typedef struct {
+	void * m_LibraryHandle;
+	PLibMCDriver_CameraDriver_GetNamePtr m_Driver_GetName;
+	PLibMCDriver_CameraDriver_GetTypePtr m_Driver_GetType;
+	PLibMCDriver_CameraDriver_GetVersionPtr m_Driver_GetVersion;
+	PLibMCDriver_CameraDriver_GetHeaderInformationPtr m_Driver_GetHeaderInformation;
+	PLibMCDriver_CameraIterator_MoveNextPtr m_Iterator_MoveNext;
+	PLibMCDriver_CameraIterator_MovePreviousPtr m_Iterator_MovePrevious;
+	PLibMCDriver_CameraIterator_GetCurrentPtr m_Iterator_GetCurrent;
+	PLibMCDriver_CameraIterator_ClonePtr m_Iterator_Clone;
+	PLibMCDriver_CameraIterator_CountPtr m_Iterator_Count;
+	PLibMCDriver_CameraPNGImage_GetWidthPtr m_PNGImage_GetWidth;
+	PLibMCDriver_CameraPNGImage_GetHeightPtr m_PNGImage_GetHeight;
+	PLibMCDriver_CameraPNGImage_GetPixelFormatPtr m_PNGImage_GetPixelFormat;
+	PLibMCDriver_CameraPNGImage_GetRawDataPtr m_PNGImage_GetRawData;
+	PLibMCDriver_CameraPNGImage_SaveToFilePtr m_PNGImage_SaveToFile;
+	PLibMCDriver_CameraDriver_Camera_CapturePNGImagePtr m_Driver_Camera_CapturePNGImage;
+	PLibMCDriver_CameraRaspiCameraDevice_GetDeviceStringPtr m_RaspiCameraDevice_GetDeviceString;
+	PLibMCDriver_CameraRaspiCameraDeviceIterator_GetCameraDevicePtr m_RaspiCameraDeviceIterator_GetCameraDevice;
+	PLibMCDriver_CameraDriver_RaspiCamera_QueryDevicesPtr m_Driver_RaspiCamera_QueryDevices;
+	PLibMCDriver_CameraDriver_RaspiCamera_InitializePtr m_Driver_RaspiCamera_Initialize;
+	PLibMCDriver_CameraGetVersionPtr m_GetVersion;
+	PLibMCDriver_CameraGetLastErrorPtr m_GetLastError;
+	PLibMCDriver_CameraReleaseInstancePtr m_ReleaseInstance;
+	PLibMCDriver_CameraAcquireInstancePtr m_AcquireInstance;
+	PLibMCDriver_CameraInjectComponentPtr m_InjectComponent;
+	PLibMCDriver_CameraGetSymbolLookupMethodPtr m_GetSymbolLookupMethod;
+	PLibMCDriver_CameraCreateDriverPtr m_CreateDriver;
+} sLibMCDriver_CameraDynamicWrapperTable;
+
+#endif // __LIBMCDRIVER_CAMERA_DYNAMICHEADER_CPPTYPES
+
diff --git a/Drivers/Camera/Headers/CppDynamic/libmcdriver_camera_dynamic.hpp b/Drivers/Camera/Headers/CppDynamic/libmcdriver_camera_dynamic.hpp
new file mode 100644
index 00000000..48af506e
--- /dev/null
+++ b/Drivers/Camera/Headers/CppDynamic/libmcdriver_camera_dynamic.hpp
@@ -0,0 +1,1342 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file in order to allow an easy
+ use of MC Driver Camera
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDRIVER_CAMERA_CPPHEADER_DYNAMIC_CPP
+#define __LIBMCDRIVER_CAMERA_CPPHEADER_DYNAMIC_CPP
+
+#include "libmcdriver_camera_types.hpp"
+#include "libmcdriver_camera_dynamic.h"
+
+#include "libmcdriverenv_dynamic.hpp"
+
+#ifdef _WIN32
+#include <windows.h>
+#else // _WIN32
+#include <dlfcn.h>
+#endif // _WIN32
+#include <string>
+#include <memory>
+#include <vector>
+#include <exception>
+
+namespace LibMCDriver_Camera {
+
+/*************************************************************************************************************************
+ Forward Declaration of all classes
+**************************************************************************************************************************/
+class CWrapper;
+class CBase;
+class CDriver;
+class CIterator;
+class CPNGImage;
+class CDriver_Camera;
+class CRaspiCameraDevice;
+class CRaspiCameraDeviceIterator;
+class CDriver_RaspiCamera;
+
+/*************************************************************************************************************************
+ Declaration of deprecated class types
+**************************************************************************************************************************/
+typedef CWrapper CLibMCDriver_CameraWrapper;
+typedef CBase CLibMCDriver_CameraBase;
+typedef CDriver CLibMCDriver_CameraDriver;
+typedef CIterator CLibMCDriver_CameraIterator;
+typedef CPNGImage CLibMCDriver_CameraPNGImage;
+typedef CDriver_Camera CLibMCDriver_CameraDriver_Camera;
+typedef CRaspiCameraDevice CLibMCDriver_CameraRaspiCameraDevice;
+typedef CRaspiCameraDeviceIterator CLibMCDriver_CameraRaspiCameraDeviceIterator;
+typedef CDriver_RaspiCamera CLibMCDriver_CameraDriver_RaspiCamera;
+
+/*************************************************************************************************************************
+ Declaration of shared pointer types
+**************************************************************************************************************************/
+typedef std::shared_ptr<CWrapper> PWrapper;
+typedef std::shared_ptr<CBase> PBase;
+typedef std::shared_ptr<CDriver> PDriver;
+typedef std::shared_ptr<CIterator> PIterator;
+typedef std::shared_ptr<CPNGImage> PPNGImage;
+typedef std::shared_ptr<CDriver_Camera> PDriver_Camera;
+typedef std::shared_ptr<CRaspiCameraDevice> PRaspiCameraDevice;
+typedef std::shared_ptr<CRaspiCameraDeviceIterator> PRaspiCameraDeviceIterator;
+typedef std::shared_ptr<CDriver_RaspiCamera> PDriver_RaspiCamera;
+
+/*************************************************************************************************************************
+ Declaration of deprecated shared pointer types
+**************************************************************************************************************************/
+typedef PWrapper PLibMCDriver_CameraWrapper;
+typedef PBase PLibMCDriver_CameraBase;
+typedef PDriver PLibMCDriver_CameraDriver;
+typedef PIterator PLibMCDriver_CameraIterator;
+typedef PPNGImage PLibMCDriver_CameraPNGImage;
+typedef PDriver_Camera PLibMCDriver_CameraDriver_Camera;
+typedef PRaspiCameraDevice PLibMCDriver_CameraRaspiCameraDevice;
+typedef PRaspiCameraDeviceIterator PLibMCDriver_CameraRaspiCameraDeviceIterator;
+typedef PDriver_RaspiCamera PLibMCDriver_CameraDriver_RaspiCamera;
+
+
+/*************************************************************************************************************************
+ classParam Definition
+**************************************************************************************************************************/
+
+template<class T> class classParam {
+private:
+	const T* m_ptr;
+
+public:
+	classParam(const T* ptr)
+		: m_ptr (ptr)
+	{
+	}
+
+	classParam(std::shared_ptr <T> sharedPtr)
+		: m_ptr (sharedPtr.get())
+	{
+	}
+
+	LibMCDriver_CameraHandle GetHandle()
+	{
+		if (m_ptr != nullptr)
+			return m_ptr->handle();
+		return nullptr;
+	}
+};
+
+/*************************************************************************************************************************
+ Class ELibMCDriver_CameraException 
+**************************************************************************************************************************/
+class ELibMCDriver_CameraException : public std::exception {
+protected:
+	/**
+	* Error code for the Exception.
+	*/
+	LibMCDriver_CameraResult m_errorCode;
+	/**
+	* Error message for the Exception.
+	*/
+	std::string m_errorMessage;
+
+public:
+	/**
+	* Exception Constructor.
+	*/
+	ELibMCDriver_CameraException(LibMCDriver_CameraResult errorCode, const std::string & sErrorMessage)
+		: m_errorMessage("LibMCDriver_Camera Error " + std::to_string(errorCode) + " (" + sErrorMessage + ")")
+	{
+		m_errorCode = errorCode;
+	}
+
+	/**
+	* Returns error code
+	*/
+	LibMCDriver_CameraResult getErrorCode() const noexcept
+	{
+		return m_errorCode;
+	}
+
+	/**
+	* Returns error message
+	*/
+	const char* what() const noexcept
+	{
+		return m_errorMessage.c_str();
+	}
+
+};
+
+/*************************************************************************************************************************
+ Class CInputVector
+**************************************************************************************************************************/
+template <typename T>
+class CInputVector {
+private:
+	
+	const T* m_data;
+	size_t m_size;
+	
+public:
+	
+	CInputVector( const std::vector<T>& vec)
+		: m_data( vec.data() ), m_size( vec.size() )
+	{
+	}
+	
+	CInputVector( const T* in_data, size_t in_size)
+		: m_data( in_data ), m_size(in_size )
+	{
+	}
+	
+	const T* data() const
+	{
+		return m_data;
+	}
+	
+	size_t size() const
+	{
+		return m_size;
+	}
+	
+};
+
+// declare deprecated class name
+template<typename T>
+using CLibMCDriver_CameraInputVector = CInputVector<T>;
+
+/*************************************************************************************************************************
+ Class CWrapper 
+**************************************************************************************************************************/
+class CWrapper {
+public:
+	
+	CWrapper(void* pSymbolLookupMethod)
+	{
+		CheckError(nullptr, initWrapperTable(&m_WrapperTable));
+		CheckError(nullptr, loadWrapperTableFromSymbolLookupMethod(&m_WrapperTable, pSymbolLookupMethod));
+		
+		CheckError(nullptr, checkBinaryVersion());
+	}
+	
+	CWrapper(const std::string &sFileName)
+	{
+		CheckError(nullptr, initWrapperTable(&m_WrapperTable));
+		CheckError(nullptr, loadWrapperTable(&m_WrapperTable, sFileName.c_str()));
+		
+		CheckError(nullptr, checkBinaryVersion());
+	}
+	
+	static PWrapper loadLibrary(const std::string &sFileName)
+	{
+		return std::make_shared<CWrapper>(sFileName);
+	}
+	
+	static PWrapper loadLibraryFromSymbolLookupMethod(void* pSymbolLookupMethod)
+	{
+		return std::make_shared<CWrapper>(pSymbolLookupMethod);
+	}
+	
+	~CWrapper()
+	{
+		releaseWrapperTable(&m_WrapperTable);
+	}
+	
+	inline void CheckError(CBase * pBaseClass, LibMCDriver_CameraResult nResult);
+
+	inline void GetVersion(LibMCDriver_Camera_uint32 & nMajor, LibMCDriver_Camera_uint32 & nMinor, LibMCDriver_Camera_uint32 & nMicro);
+	inline bool GetLastError(classParam<CBase> pInstance, std::string & sErrorMessage);
+	inline void ReleaseInstance(classParam<CBase> pInstance);
+	inline void AcquireInstance(classParam<CBase> pInstance);
+	inline void InjectComponent(const std::string & sNameSpace, const LibMCDriver_Camera_pvoid pSymbolAddressMethod);
+	inline LibMCDriver_Camera_pvoid GetSymbolLookupMethod();
+	inline PDriver CreateDriver(const std::string & sName, const std::string & sType, classParam<LibMCDriverEnv::CDriverEnvironment> pDriverEnvironment);
+
+private:
+	sLibMCDriver_CameraDynamicWrapperTable m_WrapperTable;
+	// Injected Components
+	LibMCDriverEnv::PWrapper m_pLibMCDriverEnvWrapper;
+
+	
+	LibMCDriver_CameraResult checkBinaryVersion()
+	{
+		LibMCDriver_Camera_uint32 nMajor, nMinor, nMicro;
+		GetVersion(nMajor, nMinor, nMicro);
+		if ( (nMajor != LIBMCDRIVER_CAMERA_VERSION_MAJOR) || (nMinor < LIBMCDRIVER_CAMERA_VERSION_MINOR) ) {
+			return LIBMCDRIVER_CAMERA_ERROR_INCOMPATIBLEBINARYVERSION;
+		}
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	LibMCDriver_CameraResult initWrapperTable(sLibMCDriver_CameraDynamicWrapperTable * pWrapperTable);
+	LibMCDriver_CameraResult releaseWrapperTable(sLibMCDriver_CameraDynamicWrapperTable * pWrapperTable);
+	LibMCDriver_CameraResult loadWrapperTable(sLibMCDriver_CameraDynamicWrapperTable * pWrapperTable, const char * pLibraryFileName);
+	LibMCDriver_CameraResult loadWrapperTableFromSymbolLookupMethod(sLibMCDriver_CameraDynamicWrapperTable * pWrapperTable, void* pSymbolLookupMethod);
+
+	friend class CBase;
+	friend class CDriver;
+	friend class CIterator;
+	friend class CPNGImage;
+	friend class CDriver_Camera;
+	friend class CRaspiCameraDevice;
+	friend class CRaspiCameraDeviceIterator;
+	friend class CDriver_RaspiCamera;
+
+};
+
+	
+/*************************************************************************************************************************
+ Class CBase 
+**************************************************************************************************************************/
+class CBase {
+public:
+	
+protected:
+	/* Wrapper Object that created the class. */
+	CWrapper * m_pWrapper;
+	/* Handle to Instance in library*/
+	LibMCDriver_CameraHandle m_pHandle;
+
+	/* Checks for an Error code and raises Exceptions */
+	void CheckError(LibMCDriver_CameraResult nResult)
+	{
+		if (m_pWrapper != nullptr)
+			m_pWrapper->CheckError(this, nResult);
+	}
+public:
+	/**
+	* CBase::CBase - Constructor for Base class.
+	*/
+	CBase(CWrapper * pWrapper, LibMCDriver_CameraHandle pHandle)
+		: m_pWrapper(pWrapper), m_pHandle(pHandle)
+	{
+	}
+
+	/**
+	* CBase::~CBase - Destructor for Base class.
+	*/
+	virtual ~CBase()
+	{
+		if (m_pWrapper != nullptr)
+			m_pWrapper->ReleaseInstance(this);
+		m_pWrapper = nullptr;
+	}
+
+	/**
+	* CBase::handle - Returns handle to instance.
+	*/
+	LibMCDriver_CameraHandle handle() const
+	{
+		return m_pHandle;
+	}
+
+	/**
+	* CBase::wrapper - Returns wrapper instance.
+	*/
+	CWrapper * wrapper() const
+	{
+		return m_pWrapper;
+	}
+	
+	friend class CWrapper;
+};
+	
+/*************************************************************************************************************************
+ Class CDriver 
+**************************************************************************************************************************/
+class CDriver : public CBase {
+public:
+	
+	/**
+	* CDriver::CDriver - Constructor for Driver class.
+	*/
+	CDriver(CWrapper* pWrapper, LibMCDriver_CameraHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline std::string GetName();
+	inline std::string GetType();
+	inline void GetVersion(LibMCDriver_Camera_uint32 & nMajor, LibMCDriver_Camera_uint32 & nMinor, LibMCDriver_Camera_uint32 & nMicro, std::string & sBuild);
+	inline void GetHeaderInformation(std::string & sNameSpace, std::string & sBaseName);
+};
+	
+/*************************************************************************************************************************
+ Class CIterator 
+**************************************************************************************************************************/
+class CIterator : public CBase {
+public:
+	
+	/**
+	* CIterator::CIterator - Constructor for Iterator class.
+	*/
+	CIterator(CWrapper* pWrapper, LibMCDriver_CameraHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline bool MoveNext();
+	inline bool MovePrevious();
+	inline PBase GetCurrent();
+	inline PIterator Clone();
+	inline LibMCDriver_Camera_uint64 Count();
+};
+	
+/*************************************************************************************************************************
+ Class CPNGImage 
+**************************************************************************************************************************/
+class CPNGImage : public CBase {
+public:
+	
+	/**
+	* CPNGImage::CPNGImage - Constructor for PNGImage class.
+	*/
+	CPNGImage(CWrapper* pWrapper, LibMCDriver_CameraHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline LibMCDriver_Camera_uint64 GetWidth();
+	inline LibMCDriver_Camera_uint64 GetHeight();
+	inline eImagePixelFormat GetPixelFormat();
+	inline void GetRawData(std::vector<LibMCDriver_Camera_uint8> & PNGDataBuffer);
+	inline std::string SaveToFile();
+};
+	
+/*************************************************************************************************************************
+ Class CDriver_Camera 
+**************************************************************************************************************************/
+class CDriver_Camera : public CDriver {
+public:
+	
+	/**
+	* CDriver_Camera::CDriver_Camera - Constructor for Driver_Camera class.
+	*/
+	CDriver_Camera(CWrapper* pWrapper, LibMCDriver_CameraHandle pHandle)
+		: CDriver(pWrapper, pHandle)
+	{
+	}
+	
+	inline PPNGImage CapturePNGImage();
+};
+	
+/*************************************************************************************************************************
+ Class CRaspiCameraDevice 
+**************************************************************************************************************************/
+class CRaspiCameraDevice : public CBase {
+public:
+	
+	/**
+	* CRaspiCameraDevice::CRaspiCameraDevice - Constructor for RaspiCameraDevice class.
+	*/
+	CRaspiCameraDevice(CWrapper* pWrapper, LibMCDriver_CameraHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline std::string GetDeviceString();
+};
+	
+/*************************************************************************************************************************
+ Class CRaspiCameraDeviceIterator 
+**************************************************************************************************************************/
+class CRaspiCameraDeviceIterator : public CIterator {
+public:
+	
+	/**
+	* CRaspiCameraDeviceIterator::CRaspiCameraDeviceIterator - Constructor for RaspiCameraDeviceIterator class.
+	*/
+	CRaspiCameraDeviceIterator(CWrapper* pWrapper, LibMCDriver_CameraHandle pHandle)
+		: CIterator(pWrapper, pHandle)
+	{
+	}
+	
+	inline PRaspiCameraDevice GetCameraDevice();
+};
+	
+/*************************************************************************************************************************
+ Class CDriver_RaspiCamera 
+**************************************************************************************************************************/
+class CDriver_RaspiCamera : public CDriver_Camera {
+public:
+	
+	/**
+	* CDriver_RaspiCamera::CDriver_RaspiCamera - Constructor for Driver_RaspiCamera class.
+	*/
+	CDriver_RaspiCamera(CWrapper* pWrapper, LibMCDriver_CameraHandle pHandle)
+		: CDriver_Camera(pWrapper, pHandle)
+	{
+	}
+	
+	inline PRaspiCameraDeviceIterator QueryDevices();
+	inline void Initialize(const std::string & sDeviceString, const LibMCDriver_Camera_uint32 nWidth, const LibMCDriver_Camera_uint32 nHeight, const eImagePixelFormat ePixelformat);
+};
+	
+	/**
+	* CWrapper::GetVersion - retrieves the binary version of this library.
+	* @param[out] nMajor - returns the major version of this library
+	* @param[out] nMinor - returns the minor version of this library
+	* @param[out] nMicro - returns the micro version of this library
+	*/
+	inline void CWrapper::GetVersion(LibMCDriver_Camera_uint32 & nMajor, LibMCDriver_Camera_uint32 & nMinor, LibMCDriver_Camera_uint32 & nMicro)
+	{
+		CheckError(nullptr,m_WrapperTable.m_GetVersion(&nMajor, &nMinor, &nMicro));
+	}
+	
+	/**
+	* CWrapper::GetLastError - Returns the last error recorded on this object
+	* @param[in] pInstance - Instance Handle
+	* @param[out] sErrorMessage - Message of the last error
+	* @return Is there a last error to query
+	*/
+	inline bool CWrapper::GetLastError(classParam<CBase> pInstance, std::string & sErrorMessage)
+	{
+		LibMCDriver_CameraHandle hInstance = pInstance.GetHandle();
+		LibMCDriver_Camera_uint32 bytesNeededErrorMessage = 0;
+		LibMCDriver_Camera_uint32 bytesWrittenErrorMessage = 0;
+		bool resultHasError = 0;
+		CheckError(nullptr,m_WrapperTable.m_GetLastError(hInstance, 0, &bytesNeededErrorMessage, nullptr, &resultHasError));
+		std::vector<char> bufferErrorMessage(bytesNeededErrorMessage);
+		CheckError(nullptr,m_WrapperTable.m_GetLastError(hInstance, bytesNeededErrorMessage, &bytesWrittenErrorMessage, &bufferErrorMessage[0], &resultHasError));
+		sErrorMessage = std::string(&bufferErrorMessage[0]);
+		
+		return resultHasError;
+	}
+	
+	/**
+	* CWrapper::ReleaseInstance - Releases shared ownership of an Instance
+	* @param[in] pInstance - Instance Handle
+	*/
+	inline void CWrapper::ReleaseInstance(classParam<CBase> pInstance)
+	{
+		LibMCDriver_CameraHandle hInstance = pInstance.GetHandle();
+		CheckError(nullptr,m_WrapperTable.m_ReleaseInstance(hInstance));
+	}
+	
+	/**
+	* CWrapper::AcquireInstance - Acquires shared ownership of an Instance
+	* @param[in] pInstance - Instance Handle
+	*/
+	inline void CWrapper::AcquireInstance(classParam<CBase> pInstance)
+	{
+		LibMCDriver_CameraHandle hInstance = pInstance.GetHandle();
+		CheckError(nullptr,m_WrapperTable.m_AcquireInstance(hInstance));
+	}
+	
+	/**
+	* CWrapper::InjectComponent - Injects an imported component for usage within this component
+	* @param[in] sNameSpace - NameSpace of the injected component
+	* @param[in] pSymbolAddressMethod - Address of the SymbolAddressMethod of the injected component
+	*/
+	inline void CWrapper::InjectComponent(const std::string & sNameSpace, const LibMCDriver_Camera_pvoid pSymbolAddressMethod)
+	{
+		CheckError(nullptr,m_WrapperTable.m_InjectComponent(sNameSpace.c_str(), pSymbolAddressMethod));
+		
+		bool bNameSpaceFound = false;
+		if (sNameSpace == "LibMCDriverEnv") {
+			if (m_pLibMCDriverEnvWrapper != nullptr) {
+				throw ELibMCDriver_CameraException(LIBMCDRIVER_CAMERA_ERROR_COULDNOTLOADLIBRARY, "Library with namespace " + sNameSpace + " is already registered.");
+			}
+			m_pLibMCDriverEnvWrapper = LibMCDriverEnv::CWrapper::loadLibraryFromSymbolLookupMethod(pSymbolAddressMethod);
+			bNameSpaceFound = true;
+		}
+		if (!bNameSpaceFound)
+			throw ELibMCDriver_CameraException(LIBMCDRIVER_CAMERA_ERROR_COULDNOTLOADLIBRARY, "Unknown namespace " + sNameSpace);
+	}
+	
+	/**
+	* CWrapper::GetSymbolLookupMethod - Returns the address of the SymbolLookupMethod
+	* @return Address of the SymbolAddressMethod
+	*/
+	inline LibMCDriver_Camera_pvoid CWrapper::GetSymbolLookupMethod()
+	{
+		LibMCDriver_Camera_pvoid resultSymbolLookupMethod = 0;
+		CheckError(nullptr,m_WrapperTable.m_GetSymbolLookupMethod(&resultSymbolLookupMethod));
+		
+		return resultSymbolLookupMethod;
+	}
+	
+	/**
+	* CWrapper::CreateDriver - Creates a driver instance with a specific name.
+	* @param[in] sName - Name of driver to be created.
+	* @param[in] sType - Type of driver to be created.
+	* @param[in] pDriverEnvironment - Environment of this driver.
+	* @return New Driver instance
+	*/
+	inline PDriver CWrapper::CreateDriver(const std::string & sName, const std::string & sType, classParam<LibMCDriverEnv::CDriverEnvironment> pDriverEnvironment)
+	{
+		LibMCDriverEnvHandle hDriverEnvironment = pDriverEnvironment.GetHandle();
+		LibMCDriver_CameraHandle hInstance = nullptr;
+		CheckError(nullptr,m_WrapperTable.m_CreateDriver(sName.c_str(), sType.c_str(), hDriverEnvironment, &hInstance));
+		
+		if (!hInstance) {
+			CheckError(nullptr,LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CDriver>(this, hInstance);
+	}
+	
+	inline void CWrapper::CheckError(CBase * pBaseClass, LibMCDriver_CameraResult nResult)
+	{
+		if (nResult != 0) {
+			std::string sErrorMessage;
+			if (pBaseClass != nullptr) {
+				GetLastError(pBaseClass, sErrorMessage);
+			}
+			throw ELibMCDriver_CameraException(nResult, sErrorMessage);
+		}
+	}
+	
+
+	inline LibMCDriver_CameraResult CWrapper::initWrapperTable(sLibMCDriver_CameraDynamicWrapperTable * pWrapperTable)
+	{
+		if (pWrapperTable == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM;
+		
+		pWrapperTable->m_LibraryHandle = nullptr;
+		pWrapperTable->m_Driver_GetName = nullptr;
+		pWrapperTable->m_Driver_GetType = nullptr;
+		pWrapperTable->m_Driver_GetVersion = nullptr;
+		pWrapperTable->m_Driver_GetHeaderInformation = nullptr;
+		pWrapperTable->m_Iterator_MoveNext = nullptr;
+		pWrapperTable->m_Iterator_MovePrevious = nullptr;
+		pWrapperTable->m_Iterator_GetCurrent = nullptr;
+		pWrapperTable->m_Iterator_Clone = nullptr;
+		pWrapperTable->m_Iterator_Count = nullptr;
+		pWrapperTable->m_PNGImage_GetWidth = nullptr;
+		pWrapperTable->m_PNGImage_GetHeight = nullptr;
+		pWrapperTable->m_PNGImage_GetPixelFormat = nullptr;
+		pWrapperTable->m_PNGImage_GetRawData = nullptr;
+		pWrapperTable->m_PNGImage_SaveToFile = nullptr;
+		pWrapperTable->m_Driver_Camera_CapturePNGImage = nullptr;
+		pWrapperTable->m_RaspiCameraDevice_GetDeviceString = nullptr;
+		pWrapperTable->m_RaspiCameraDeviceIterator_GetCameraDevice = nullptr;
+		pWrapperTable->m_Driver_RaspiCamera_QueryDevices = nullptr;
+		pWrapperTable->m_Driver_RaspiCamera_Initialize = nullptr;
+		pWrapperTable->m_GetVersion = nullptr;
+		pWrapperTable->m_GetLastError = nullptr;
+		pWrapperTable->m_ReleaseInstance = nullptr;
+		pWrapperTable->m_AcquireInstance = nullptr;
+		pWrapperTable->m_InjectComponent = nullptr;
+		pWrapperTable->m_GetSymbolLookupMethod = nullptr;
+		pWrapperTable->m_CreateDriver = nullptr;
+		
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+
+	inline LibMCDriver_CameraResult CWrapper::releaseWrapperTable(sLibMCDriver_CameraDynamicWrapperTable * pWrapperTable)
+	{
+		if (pWrapperTable == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM;
+		
+		if (pWrapperTable->m_LibraryHandle != nullptr) {
+		#ifdef _WIN32
+			HMODULE hModule = (HMODULE) pWrapperTable->m_LibraryHandle;
+			FreeLibrary(hModule);
+		#else // _WIN32
+			dlclose(pWrapperTable->m_LibraryHandle);
+		#endif // _WIN32
+			return initWrapperTable(pWrapperTable);
+		}
+		
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+
+	inline LibMCDriver_CameraResult CWrapper::loadWrapperTable(sLibMCDriver_CameraDynamicWrapperTable * pWrapperTable, const char * pLibraryFileName)
+	{
+		if (pWrapperTable == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM;
+		if (pLibraryFileName == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM;
+		
+		#ifdef _WIN32
+		// Convert filename to UTF16-string
+		int nLength = (int)strlen(pLibraryFileName);
+		int nBufferSize = nLength * 2 + 2;
+		std::vector<wchar_t> wsLibraryFileName(nBufferSize);
+		int nResult = MultiByteToWideChar(CP_UTF8, 0, pLibraryFileName, nLength, &wsLibraryFileName[0], nBufferSize);
+		if (nResult == 0)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTLOADLIBRARY;
+		
+		HMODULE hLibrary = LoadLibraryW(wsLibraryFileName.data());
+		if (hLibrary == 0) 
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTLOADLIBRARY;
+		#else // _WIN32
+		void* hLibrary = dlopen(pLibraryFileName, RTLD_LAZY);
+		if (hLibrary == 0) 
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTLOADLIBRARY;
+		dlerror();
+		#endif // _WIN32
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_GetName = (PLibMCDriver_CameraDriver_GetNamePtr) GetProcAddress(hLibrary, "libmcdriver_camera_driver_getname");
+		#else // _WIN32
+		pWrapperTable->m_Driver_GetName = (PLibMCDriver_CameraDriver_GetNamePtr) dlsym(hLibrary, "libmcdriver_camera_driver_getname");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_GetName == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_GetType = (PLibMCDriver_CameraDriver_GetTypePtr) GetProcAddress(hLibrary, "libmcdriver_camera_driver_gettype");
+		#else // _WIN32
+		pWrapperTable->m_Driver_GetType = (PLibMCDriver_CameraDriver_GetTypePtr) dlsym(hLibrary, "libmcdriver_camera_driver_gettype");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_GetType == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_GetVersion = (PLibMCDriver_CameraDriver_GetVersionPtr) GetProcAddress(hLibrary, "libmcdriver_camera_driver_getversion");
+		#else // _WIN32
+		pWrapperTable->m_Driver_GetVersion = (PLibMCDriver_CameraDriver_GetVersionPtr) dlsym(hLibrary, "libmcdriver_camera_driver_getversion");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_GetVersion == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_GetHeaderInformation = (PLibMCDriver_CameraDriver_GetHeaderInformationPtr) GetProcAddress(hLibrary, "libmcdriver_camera_driver_getheaderinformation");
+		#else // _WIN32
+		pWrapperTable->m_Driver_GetHeaderInformation = (PLibMCDriver_CameraDriver_GetHeaderInformationPtr) dlsym(hLibrary, "libmcdriver_camera_driver_getheaderinformation");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_GetHeaderInformation == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Iterator_MoveNext = (PLibMCDriver_CameraIterator_MoveNextPtr) GetProcAddress(hLibrary, "libmcdriver_camera_iterator_movenext");
+		#else // _WIN32
+		pWrapperTable->m_Iterator_MoveNext = (PLibMCDriver_CameraIterator_MoveNextPtr) dlsym(hLibrary, "libmcdriver_camera_iterator_movenext");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Iterator_MoveNext == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Iterator_MovePrevious = (PLibMCDriver_CameraIterator_MovePreviousPtr) GetProcAddress(hLibrary, "libmcdriver_camera_iterator_moveprevious");
+		#else // _WIN32
+		pWrapperTable->m_Iterator_MovePrevious = (PLibMCDriver_CameraIterator_MovePreviousPtr) dlsym(hLibrary, "libmcdriver_camera_iterator_moveprevious");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Iterator_MovePrevious == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Iterator_GetCurrent = (PLibMCDriver_CameraIterator_GetCurrentPtr) GetProcAddress(hLibrary, "libmcdriver_camera_iterator_getcurrent");
+		#else // _WIN32
+		pWrapperTable->m_Iterator_GetCurrent = (PLibMCDriver_CameraIterator_GetCurrentPtr) dlsym(hLibrary, "libmcdriver_camera_iterator_getcurrent");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Iterator_GetCurrent == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Iterator_Clone = (PLibMCDriver_CameraIterator_ClonePtr) GetProcAddress(hLibrary, "libmcdriver_camera_iterator_clone");
+		#else // _WIN32
+		pWrapperTable->m_Iterator_Clone = (PLibMCDriver_CameraIterator_ClonePtr) dlsym(hLibrary, "libmcdriver_camera_iterator_clone");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Iterator_Clone == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Iterator_Count = (PLibMCDriver_CameraIterator_CountPtr) GetProcAddress(hLibrary, "libmcdriver_camera_iterator_count");
+		#else // _WIN32
+		pWrapperTable->m_Iterator_Count = (PLibMCDriver_CameraIterator_CountPtr) dlsym(hLibrary, "libmcdriver_camera_iterator_count");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Iterator_Count == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_PNGImage_GetWidth = (PLibMCDriver_CameraPNGImage_GetWidthPtr) GetProcAddress(hLibrary, "libmcdriver_camera_pngimage_getwidth");
+		#else // _WIN32
+		pWrapperTable->m_PNGImage_GetWidth = (PLibMCDriver_CameraPNGImage_GetWidthPtr) dlsym(hLibrary, "libmcdriver_camera_pngimage_getwidth");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_PNGImage_GetWidth == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_PNGImage_GetHeight = (PLibMCDriver_CameraPNGImage_GetHeightPtr) GetProcAddress(hLibrary, "libmcdriver_camera_pngimage_getheight");
+		#else // _WIN32
+		pWrapperTable->m_PNGImage_GetHeight = (PLibMCDriver_CameraPNGImage_GetHeightPtr) dlsym(hLibrary, "libmcdriver_camera_pngimage_getheight");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_PNGImage_GetHeight == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_PNGImage_GetPixelFormat = (PLibMCDriver_CameraPNGImage_GetPixelFormatPtr) GetProcAddress(hLibrary, "libmcdriver_camera_pngimage_getpixelformat");
+		#else // _WIN32
+		pWrapperTable->m_PNGImage_GetPixelFormat = (PLibMCDriver_CameraPNGImage_GetPixelFormatPtr) dlsym(hLibrary, "libmcdriver_camera_pngimage_getpixelformat");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_PNGImage_GetPixelFormat == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_PNGImage_GetRawData = (PLibMCDriver_CameraPNGImage_GetRawDataPtr) GetProcAddress(hLibrary, "libmcdriver_camera_pngimage_getrawdata");
+		#else // _WIN32
+		pWrapperTable->m_PNGImage_GetRawData = (PLibMCDriver_CameraPNGImage_GetRawDataPtr) dlsym(hLibrary, "libmcdriver_camera_pngimage_getrawdata");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_PNGImage_GetRawData == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_PNGImage_SaveToFile = (PLibMCDriver_CameraPNGImage_SaveToFilePtr) GetProcAddress(hLibrary, "libmcdriver_camera_pngimage_savetofile");
+		#else // _WIN32
+		pWrapperTable->m_PNGImage_SaveToFile = (PLibMCDriver_CameraPNGImage_SaveToFilePtr) dlsym(hLibrary, "libmcdriver_camera_pngimage_savetofile");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_PNGImage_SaveToFile == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_Camera_CapturePNGImage = (PLibMCDriver_CameraDriver_Camera_CapturePNGImagePtr) GetProcAddress(hLibrary, "libmcdriver_camera_driver_camera_capturepngimage");
+		#else // _WIN32
+		pWrapperTable->m_Driver_Camera_CapturePNGImage = (PLibMCDriver_CameraDriver_Camera_CapturePNGImagePtr) dlsym(hLibrary, "libmcdriver_camera_driver_camera_capturepngimage");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_Camera_CapturePNGImage == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_RaspiCameraDevice_GetDeviceString = (PLibMCDriver_CameraRaspiCameraDevice_GetDeviceStringPtr) GetProcAddress(hLibrary, "libmcdriver_camera_raspicameradevice_getdevicestring");
+		#else // _WIN32
+		pWrapperTable->m_RaspiCameraDevice_GetDeviceString = (PLibMCDriver_CameraRaspiCameraDevice_GetDeviceStringPtr) dlsym(hLibrary, "libmcdriver_camera_raspicameradevice_getdevicestring");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_RaspiCameraDevice_GetDeviceString == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_RaspiCameraDeviceIterator_GetCameraDevice = (PLibMCDriver_CameraRaspiCameraDeviceIterator_GetCameraDevicePtr) GetProcAddress(hLibrary, "libmcdriver_camera_raspicameradeviceiterator_getcameradevice");
+		#else // _WIN32
+		pWrapperTable->m_RaspiCameraDeviceIterator_GetCameraDevice = (PLibMCDriver_CameraRaspiCameraDeviceIterator_GetCameraDevicePtr) dlsym(hLibrary, "libmcdriver_camera_raspicameradeviceiterator_getcameradevice");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_RaspiCameraDeviceIterator_GetCameraDevice == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_RaspiCamera_QueryDevices = (PLibMCDriver_CameraDriver_RaspiCamera_QueryDevicesPtr) GetProcAddress(hLibrary, "libmcdriver_camera_driver_raspicamera_querydevices");
+		#else // _WIN32
+		pWrapperTable->m_Driver_RaspiCamera_QueryDevices = (PLibMCDriver_CameraDriver_RaspiCamera_QueryDevicesPtr) dlsym(hLibrary, "libmcdriver_camera_driver_raspicamera_querydevices");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_RaspiCamera_QueryDevices == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_RaspiCamera_Initialize = (PLibMCDriver_CameraDriver_RaspiCamera_InitializePtr) GetProcAddress(hLibrary, "libmcdriver_camera_driver_raspicamera_initialize");
+		#else // _WIN32
+		pWrapperTable->m_Driver_RaspiCamera_Initialize = (PLibMCDriver_CameraDriver_RaspiCamera_InitializePtr) dlsym(hLibrary, "libmcdriver_camera_driver_raspicamera_initialize");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_RaspiCamera_Initialize == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_GetVersion = (PLibMCDriver_CameraGetVersionPtr) GetProcAddress(hLibrary, "libmcdriver_camera_getversion");
+		#else // _WIN32
+		pWrapperTable->m_GetVersion = (PLibMCDriver_CameraGetVersionPtr) dlsym(hLibrary, "libmcdriver_camera_getversion");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_GetVersion == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_GetLastError = (PLibMCDriver_CameraGetLastErrorPtr) GetProcAddress(hLibrary, "libmcdriver_camera_getlasterror");
+		#else // _WIN32
+		pWrapperTable->m_GetLastError = (PLibMCDriver_CameraGetLastErrorPtr) dlsym(hLibrary, "libmcdriver_camera_getlasterror");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_GetLastError == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_ReleaseInstance = (PLibMCDriver_CameraReleaseInstancePtr) GetProcAddress(hLibrary, "libmcdriver_camera_releaseinstance");
+		#else // _WIN32
+		pWrapperTable->m_ReleaseInstance = (PLibMCDriver_CameraReleaseInstancePtr) dlsym(hLibrary, "libmcdriver_camera_releaseinstance");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_ReleaseInstance == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_AcquireInstance = (PLibMCDriver_CameraAcquireInstancePtr) GetProcAddress(hLibrary, "libmcdriver_camera_acquireinstance");
+		#else // _WIN32
+		pWrapperTable->m_AcquireInstance = (PLibMCDriver_CameraAcquireInstancePtr) dlsym(hLibrary, "libmcdriver_camera_acquireinstance");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_AcquireInstance == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_InjectComponent = (PLibMCDriver_CameraInjectComponentPtr) GetProcAddress(hLibrary, "libmcdriver_camera_injectcomponent");
+		#else // _WIN32
+		pWrapperTable->m_InjectComponent = (PLibMCDriver_CameraInjectComponentPtr) dlsym(hLibrary, "libmcdriver_camera_injectcomponent");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_InjectComponent == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_GetSymbolLookupMethod = (PLibMCDriver_CameraGetSymbolLookupMethodPtr) GetProcAddress(hLibrary, "libmcdriver_camera_getsymbollookupmethod");
+		#else // _WIN32
+		pWrapperTable->m_GetSymbolLookupMethod = (PLibMCDriver_CameraGetSymbolLookupMethodPtr) dlsym(hLibrary, "libmcdriver_camera_getsymbollookupmethod");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_GetSymbolLookupMethod == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_CreateDriver = (PLibMCDriver_CameraCreateDriverPtr) GetProcAddress(hLibrary, "libmcdriver_camera_createdriver");
+		#else // _WIN32
+		pWrapperTable->m_CreateDriver = (PLibMCDriver_CameraCreateDriverPtr) dlsym(hLibrary, "libmcdriver_camera_createdriver");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_CreateDriver == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		pWrapperTable->m_LibraryHandle = hLibrary;
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+
+	inline LibMCDriver_CameraResult CWrapper::loadWrapperTableFromSymbolLookupMethod(sLibMCDriver_CameraDynamicWrapperTable * pWrapperTable, void* pSymbolLookupMethod)
+{
+		if (pWrapperTable == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM;
+		if (pSymbolLookupMethod == nullptr)
+			return LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM;
+		
+		typedef LibMCDriver_CameraResult(*SymbolLookupType)(const char*, void**);
+		
+		SymbolLookupType pLookup = (SymbolLookupType)pSymbolLookupMethod;
+		
+		LibMCDriver_CameraResult eLookupError = LIBMCDRIVER_CAMERA_SUCCESS;
+		eLookupError = (*pLookup)("libmcdriver_camera_driver_getname", (void**)&(pWrapperTable->m_Driver_GetName));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_GetName == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_driver_gettype", (void**)&(pWrapperTable->m_Driver_GetType));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_GetType == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_driver_getversion", (void**)&(pWrapperTable->m_Driver_GetVersion));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_GetVersion == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_driver_getheaderinformation", (void**)&(pWrapperTable->m_Driver_GetHeaderInformation));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_GetHeaderInformation == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_iterator_movenext", (void**)&(pWrapperTable->m_Iterator_MoveNext));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Iterator_MoveNext == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_iterator_moveprevious", (void**)&(pWrapperTable->m_Iterator_MovePrevious));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Iterator_MovePrevious == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_iterator_getcurrent", (void**)&(pWrapperTable->m_Iterator_GetCurrent));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Iterator_GetCurrent == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_iterator_clone", (void**)&(pWrapperTable->m_Iterator_Clone));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Iterator_Clone == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_iterator_count", (void**)&(pWrapperTable->m_Iterator_Count));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Iterator_Count == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_pngimage_getwidth", (void**)&(pWrapperTable->m_PNGImage_GetWidth));
+		if ( (eLookupError != 0) || (pWrapperTable->m_PNGImage_GetWidth == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_pngimage_getheight", (void**)&(pWrapperTable->m_PNGImage_GetHeight));
+		if ( (eLookupError != 0) || (pWrapperTable->m_PNGImage_GetHeight == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_pngimage_getpixelformat", (void**)&(pWrapperTable->m_PNGImage_GetPixelFormat));
+		if ( (eLookupError != 0) || (pWrapperTable->m_PNGImage_GetPixelFormat == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_pngimage_getrawdata", (void**)&(pWrapperTable->m_PNGImage_GetRawData));
+		if ( (eLookupError != 0) || (pWrapperTable->m_PNGImage_GetRawData == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_pngimage_savetofile", (void**)&(pWrapperTable->m_PNGImage_SaveToFile));
+		if ( (eLookupError != 0) || (pWrapperTable->m_PNGImage_SaveToFile == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_driver_camera_capturepngimage", (void**)&(pWrapperTable->m_Driver_Camera_CapturePNGImage));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Camera_CapturePNGImage == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_raspicameradevice_getdevicestring", (void**)&(pWrapperTable->m_RaspiCameraDevice_GetDeviceString));
+		if ( (eLookupError != 0) || (pWrapperTable->m_RaspiCameraDevice_GetDeviceString == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_raspicameradeviceiterator_getcameradevice", (void**)&(pWrapperTable->m_RaspiCameraDeviceIterator_GetCameraDevice));
+		if ( (eLookupError != 0) || (pWrapperTable->m_RaspiCameraDeviceIterator_GetCameraDevice == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_driver_raspicamera_querydevices", (void**)&(pWrapperTable->m_Driver_RaspiCamera_QueryDevices));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_RaspiCamera_QueryDevices == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_driver_raspicamera_initialize", (void**)&(pWrapperTable->m_Driver_RaspiCamera_Initialize));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_RaspiCamera_Initialize == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_getversion", (void**)&(pWrapperTable->m_GetVersion));
+		if ( (eLookupError != 0) || (pWrapperTable->m_GetVersion == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_getlasterror", (void**)&(pWrapperTable->m_GetLastError));
+		if ( (eLookupError != 0) || (pWrapperTable->m_GetLastError == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_releaseinstance", (void**)&(pWrapperTable->m_ReleaseInstance));
+		if ( (eLookupError != 0) || (pWrapperTable->m_ReleaseInstance == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_acquireinstance", (void**)&(pWrapperTable->m_AcquireInstance));
+		if ( (eLookupError != 0) || (pWrapperTable->m_AcquireInstance == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_injectcomponent", (void**)&(pWrapperTable->m_InjectComponent));
+		if ( (eLookupError != 0) || (pWrapperTable->m_InjectComponent == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_getsymbollookupmethod", (void**)&(pWrapperTable->m_GetSymbolLookupMethod));
+		if ( (eLookupError != 0) || (pWrapperTable->m_GetSymbolLookupMethod == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_camera_createdriver", (void**)&(pWrapperTable->m_CreateDriver));
+		if ( (eLookupError != 0) || (pWrapperTable->m_CreateDriver == nullptr) )
+			return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+}
+
+	
+	
+	/**
+	 * Method definitions for class CBase
+	 */
+	
+	/**
+	 * Method definitions for class CDriver
+	 */
+	
+	/**
+	* CDriver::GetName - returns the name identifier of the driver
+	* @return Name of the driver.
+	*/
+	std::string CDriver::GetName()
+	{
+		LibMCDriver_Camera_uint32 bytesNeededName = 0;
+		LibMCDriver_Camera_uint32 bytesWrittenName = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetName(m_pHandle, 0, &bytesNeededName, nullptr));
+		std::vector<char> bufferName(bytesNeededName);
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetName(m_pHandle, bytesNeededName, &bytesWrittenName, &bufferName[0]));
+		
+		return std::string(&bufferName[0]);
+	}
+	
+	/**
+	* CDriver::GetType - returns the type identifier of the driver
+	* @return Type of the driver.
+	*/
+	std::string CDriver::GetType()
+	{
+		LibMCDriver_Camera_uint32 bytesNeededType = 0;
+		LibMCDriver_Camera_uint32 bytesWrittenType = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetType(m_pHandle, 0, &bytesNeededType, nullptr));
+		std::vector<char> bufferType(bytesNeededType);
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetType(m_pHandle, bytesNeededType, &bytesWrittenType, &bufferType[0]));
+		
+		return std::string(&bufferType[0]);
+	}
+	
+	/**
+	* CDriver::GetVersion - returns the version identifiers of the driver
+	* @param[out] nMajor - Major version.
+	* @param[out] nMinor - Minor version.
+	* @param[out] nMicro - Micro version.
+	* @param[out] sBuild - Build identifier.
+	*/
+	void CDriver::GetVersion(LibMCDriver_Camera_uint32 & nMajor, LibMCDriver_Camera_uint32 & nMinor, LibMCDriver_Camera_uint32 & nMicro, std::string & sBuild)
+	{
+		LibMCDriver_Camera_uint32 bytesNeededBuild = 0;
+		LibMCDriver_Camera_uint32 bytesWrittenBuild = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetVersion(m_pHandle, &nMajor, &nMinor, &nMicro, 0, &bytesNeededBuild, nullptr));
+		std::vector<char> bufferBuild(bytesNeededBuild);
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetVersion(m_pHandle, &nMajor, &nMinor, &nMicro, bytesNeededBuild, &bytesWrittenBuild, &bufferBuild[0]));
+		sBuild = std::string(&bufferBuild[0]);
+	}
+	
+	/**
+	* CDriver::GetHeaderInformation - returns the header information
+	* @param[out] sNameSpace - NameSpace of the driver.
+	* @param[out] sBaseName - BaseName of the driver.
+	*/
+	void CDriver::GetHeaderInformation(std::string & sNameSpace, std::string & sBaseName)
+	{
+		LibMCDriver_Camera_uint32 bytesNeededNameSpace = 0;
+		LibMCDriver_Camera_uint32 bytesWrittenNameSpace = 0;
+		LibMCDriver_Camera_uint32 bytesNeededBaseName = 0;
+		LibMCDriver_Camera_uint32 bytesWrittenBaseName = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetHeaderInformation(m_pHandle, 0, &bytesNeededNameSpace, nullptr, 0, &bytesNeededBaseName, nullptr));
+		std::vector<char> bufferNameSpace(bytesNeededNameSpace);
+		std::vector<char> bufferBaseName(bytesNeededBaseName);
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetHeaderInformation(m_pHandle, bytesNeededNameSpace, &bytesWrittenNameSpace, &bufferNameSpace[0], bytesNeededBaseName, &bytesWrittenBaseName, &bufferBaseName[0]));
+		sNameSpace = std::string(&bufferNameSpace[0]);
+		sBaseName = std::string(&bufferBaseName[0]);
+	}
+	
+	/**
+	 * Method definitions for class CIterator
+	 */
+	
+	/**
+	* CIterator::MoveNext - Iterates to the next resource in the list.
+	* @return Iterates to the next resource in the list.
+	*/
+	bool CIterator::MoveNext()
+	{
+		bool resultHasNext = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Iterator_MoveNext(m_pHandle, &resultHasNext));
+		
+		return resultHasNext;
+	}
+	
+	/**
+	* CIterator::MovePrevious - Iterates to the previous resource in the list.
+	* @return Iterates to the previous resource in the list.
+	*/
+	bool CIterator::MovePrevious()
+	{
+		bool resultHasPrevious = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Iterator_MovePrevious(m_pHandle, &resultHasPrevious));
+		
+		return resultHasPrevious;
+	}
+	
+	/**
+	* CIterator::GetCurrent - Returns the resource the iterator points at.
+	* @return returns the resource instance.
+	*/
+	PBase CIterator::GetCurrent()
+	{
+		LibMCDriver_CameraHandle hCurrentInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_Iterator_GetCurrent(m_pHandle, &hCurrentInstance));
+		
+		if (!hCurrentInstance) {
+			CheckError(LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CBase>(m_pWrapper, hCurrentInstance);
+	}
+	
+	/**
+	* CIterator::Clone - Creates a new resource iterator with the same resource list.
+	* @return returns the cloned Iterator instance
+	*/
+	PIterator CIterator::Clone()
+	{
+		LibMCDriver_CameraHandle hOutIterator = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_Iterator_Clone(m_pHandle, &hOutIterator));
+		
+		if (!hOutIterator) {
+			CheckError(LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CIterator>(m_pWrapper, hOutIterator);
+	}
+	
+	/**
+	* CIterator::Count - Returns the number of resources the iterator captures.
+	* @return returns the number of resources the iterator captures.
+	*/
+	LibMCDriver_Camera_uint64 CIterator::Count()
+	{
+		LibMCDriver_Camera_uint64 resultCount = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Iterator_Count(m_pHandle, &resultCount));
+		
+		return resultCount;
+	}
+	
+	/**
+	 * Method definitions for class CPNGImage
+	 */
+	
+	/**
+	* CPNGImage::GetWidth - Returns width of the image.
+	* @return width of the image in pixels.
+	*/
+	LibMCDriver_Camera_uint64 CPNGImage::GetWidth()
+	{
+		LibMCDriver_Camera_uint64 resultWidth = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_PNGImage_GetWidth(m_pHandle, &resultWidth));
+		
+		return resultWidth;
+	}
+	
+	/**
+	* CPNGImage::GetHeight - Returns height of the image.
+	* @return height of the image in pixels.
+	*/
+	LibMCDriver_Camera_uint64 CPNGImage::GetHeight()
+	{
+		LibMCDriver_Camera_uint64 resultHeight = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_PNGImage_GetHeight(m_pHandle, &resultHeight));
+		
+		return resultHeight;
+	}
+	
+	/**
+	* CPNGImage::GetPixelFormat - Returns pixel format of the image.
+	* @return Pixel format of the image.
+	*/
+	eImagePixelFormat CPNGImage::GetPixelFormat()
+	{
+		eImagePixelFormat resultPixelformat = (eImagePixelFormat) 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_PNGImage_GetPixelFormat(m_pHandle, &resultPixelformat));
+		
+		return resultPixelformat;
+	}
+	
+	/**
+	* CPNGImage::GetRawData - Returns raw data of the image.
+	* @param[out] PNGDataBuffer - Binary data of PNG image captured.
+	*/
+	void CPNGImage::GetRawData(std::vector<LibMCDriver_Camera_uint8> & PNGDataBuffer)
+	{
+		LibMCDriver_Camera_uint64 elementsNeededPNGData = 0;
+		LibMCDriver_Camera_uint64 elementsWrittenPNGData = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_PNGImage_GetRawData(m_pHandle, 0, &elementsNeededPNGData, nullptr));
+		PNGDataBuffer.resize((size_t) elementsNeededPNGData);
+		CheckError(m_pWrapper->m_WrapperTable.m_PNGImage_GetRawData(m_pHandle, elementsNeededPNGData, &elementsWrittenPNGData, PNGDataBuffer.data()));
+	}
+	
+	/**
+	* CPNGImage::SaveToFile - Saves PNG Image on Disk.
+	* @return Filename to save PNG to.
+	*/
+	std::string CPNGImage::SaveToFile()
+	{
+		LibMCDriver_Camera_uint32 bytesNeededFileName = 0;
+		LibMCDriver_Camera_uint32 bytesWrittenFileName = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_PNGImage_SaveToFile(m_pHandle, 0, &bytesNeededFileName, nullptr));
+		std::vector<char> bufferFileName(bytesNeededFileName);
+		CheckError(m_pWrapper->m_WrapperTable.m_PNGImage_SaveToFile(m_pHandle, bytesNeededFileName, &bytesWrittenFileName, &bufferFileName[0]));
+		
+		return std::string(&bufferFileName[0]);
+	}
+	
+	/**
+	 * Method definitions for class CDriver_Camera
+	 */
+	
+	/**
+	* CDriver_Camera::CapturePNGImage - Captures an image from the camera and returns a PNG image.
+	* @return Instance of the PNG Image.
+	*/
+	PPNGImage CDriver_Camera::CapturePNGImage()
+	{
+		LibMCDriver_CameraHandle hPNGImage = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Camera_CapturePNGImage(m_pHandle, &hPNGImage));
+		
+		if (!hPNGImage) {
+			CheckError(LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CPNGImage>(m_pWrapper, hPNGImage);
+	}
+	
+	/**
+	 * Method definitions for class CRaspiCameraDevice
+	 */
+	
+	/**
+	* CRaspiCameraDevice::GetDeviceString - Returns path to the camera device.
+	* @return Path to camera device.
+	*/
+	std::string CRaspiCameraDevice::GetDeviceString()
+	{
+		LibMCDriver_Camera_uint32 bytesNeededDeviceString = 0;
+		LibMCDriver_Camera_uint32 bytesWrittenDeviceString = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_RaspiCameraDevice_GetDeviceString(m_pHandle, 0, &bytesNeededDeviceString, nullptr));
+		std::vector<char> bufferDeviceString(bytesNeededDeviceString);
+		CheckError(m_pWrapper->m_WrapperTable.m_RaspiCameraDevice_GetDeviceString(m_pHandle, bytesNeededDeviceString, &bytesWrittenDeviceString, &bufferDeviceString[0]));
+		
+		return std::string(&bufferDeviceString[0]);
+	}
+	
+	/**
+	 * Method definitions for class CRaspiCameraDeviceIterator
+	 */
+	
+	/**
+	* CRaspiCameraDeviceIterator::GetCameraDevice - Returns the camera device the iterator points at.
+	* @return returns the camera device instance.
+	*/
+	PRaspiCameraDevice CRaspiCameraDeviceIterator::GetCameraDevice()
+	{
+		LibMCDriver_CameraHandle hCurrentInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_RaspiCameraDeviceIterator_GetCameraDevice(m_pHandle, &hCurrentInstance));
+		
+		if (!hCurrentInstance) {
+			CheckError(LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CRaspiCameraDevice>(m_pWrapper, hCurrentInstance);
+	}
+	
+	/**
+	 * Method definitions for class CDriver_RaspiCamera
+	 */
+	
+	/**
+	* CDriver_RaspiCamera::QueryDevices - Looks for cameras on the Raspberry PI.
+	* @return Iterator Instance through all found devices.
+	*/
+	PRaspiCameraDeviceIterator CDriver_RaspiCamera::QueryDevices()
+	{
+		LibMCDriver_CameraHandle hDeviceIterator = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_RaspiCamera_QueryDevices(m_pHandle, &hDeviceIterator));
+		
+		if (!hDeviceIterator) {
+			CheckError(LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CRaspiCameraDeviceIterator>(m_pWrapper, hDeviceIterator);
+	}
+	
+	/**
+	* CDriver_RaspiCamera::Initialize - Initialize the camera on the Raspberry PI.
+	* @param[in] sDeviceString - Path to camera device.
+	* @param[in] nWidth - Width of Image in Pixels.
+	* @param[in] nHeight - Height of Image in Pixels.
+	* @param[in] ePixelformat - Pixel format of the image.
+	*/
+	void CDriver_RaspiCamera::Initialize(const std::string & sDeviceString, const LibMCDriver_Camera_uint32 nWidth, const LibMCDriver_Camera_uint32 nHeight, const eImagePixelFormat ePixelformat)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_RaspiCamera_Initialize(m_pHandle, sDeviceString.c_str(), nWidth, nHeight, ePixelformat));
+	}
+
+} // namespace LibMCDriver_Camera
+
+#endif // __LIBMCDRIVER_CAMERA_CPPHEADER_DYNAMIC_CPP
+
diff --git a/Drivers/Camera/Headers/CppDynamic/libmcdriver_camera_types.hpp b/Drivers/Camera/Headers/CppDynamic/libmcdriver_camera_types.hpp
new file mode 100644
index 00000000..7897cf0a
--- /dev/null
+++ b/Drivers/Camera/Headers/CppDynamic/libmcdriver_camera_types.hpp
@@ -0,0 +1,163 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file with basic types in
+order to allow an easy use of MC Driver Camera
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDRIVER_CAMERA_TYPES_HEADER_CPP
+#define __LIBMCDRIVER_CAMERA_TYPES_HEADER_CPP
+
+
+/*************************************************************************************************************************
+ Scalar types definition
+**************************************************************************************************************************/
+
+#ifdef LIBMCDRIVER_CAMERA_USELEGACYINTEGERTYPES
+
+typedef unsigned char LibMCDriver_Camera_uint8;
+typedef unsigned short LibMCDriver_Camera_uint16 ;
+typedef unsigned int LibMCDriver_Camera_uint32;
+typedef unsigned long long LibMCDriver_Camera_uint64;
+typedef char LibMCDriver_Camera_int8;
+typedef short LibMCDriver_Camera_int16;
+typedef int LibMCDriver_Camera_int32;
+typedef long long LibMCDriver_Camera_int64;
+
+#else // LIBMCDRIVER_CAMERA_USELEGACYINTEGERTYPES
+
+#include <stdint.h>
+
+typedef uint8_t LibMCDriver_Camera_uint8;
+typedef uint16_t LibMCDriver_Camera_uint16;
+typedef uint32_t LibMCDriver_Camera_uint32;
+typedef uint64_t LibMCDriver_Camera_uint64;
+typedef int8_t LibMCDriver_Camera_int8;
+typedef int16_t LibMCDriver_Camera_int16;
+typedef int32_t LibMCDriver_Camera_int32;
+typedef int64_t LibMCDriver_Camera_int64 ;
+
+#endif // LIBMCDRIVER_CAMERA_USELEGACYINTEGERTYPES
+
+typedef float LibMCDriver_Camera_single;
+typedef double LibMCDriver_Camera_double;
+
+/*************************************************************************************************************************
+ General type definitions
+**************************************************************************************************************************/
+
+typedef LibMCDriver_Camera_int32 LibMCDriver_CameraResult;
+typedef void * LibMCDriver_CameraHandle;
+typedef void * LibMCDriver_Camera_pvoid;
+
+/*************************************************************************************************************************
+ Version for LibMCDriver_Camera
+**************************************************************************************************************************/
+
+#define LIBMCDRIVER_CAMERA_VERSION_MAJOR 1
+#define LIBMCDRIVER_CAMERA_VERSION_MINOR 0
+#define LIBMCDRIVER_CAMERA_VERSION_MICRO 0
+#define LIBMCDRIVER_CAMERA_VERSION_PRERELEASEINFO ""
+#define LIBMCDRIVER_CAMERA_VERSION_BUILDINFO ""
+
+/*************************************************************************************************************************
+ Error constants for LibMCDriver_Camera
+**************************************************************************************************************************/
+
+#define LIBMCDRIVER_CAMERA_SUCCESS 0
+#define LIBMCDRIVER_CAMERA_ERROR_NOTIMPLEMENTED 1
+#define LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM 2
+#define LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST 3
+#define LIBMCDRIVER_CAMERA_ERROR_BUFFERTOOSMALL 4
+#define LIBMCDRIVER_CAMERA_ERROR_GENERICEXCEPTION 5
+#define LIBMCDRIVER_CAMERA_ERROR_COULDNOTLOADLIBRARY 6
+#define LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT 7
+#define LIBMCDRIVER_CAMERA_ERROR_INCOMPATIBLEBINARYVERSION 8
+#define LIBMCDRIVER_CAMERA_ERROR_INVALIDSTATENAME 9
+#define LIBMCDRIVER_CAMERA_ERROR_DRIVERERROR 1000
+#define LIBMCDRIVER_CAMERA_ERROR_ITERATORERROR 1001
+
+/*************************************************************************************************************************
+ Error strings for LibMCDriver_Camera
+**************************************************************************************************************************/
+
+inline const char * LIBMCDRIVER_CAMERA_GETERRORSTRING (LibMCDriver_CameraResult nErrorCode) {
+  switch (nErrorCode) {
+    case LIBMCDRIVER_CAMERA_SUCCESS: return "no error";
+    case LIBMCDRIVER_CAMERA_ERROR_NOTIMPLEMENTED: return "functionality not implemented";
+    case LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM: return "an invalid parameter was passed";
+    case LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST: return "a type cast failed";
+    case LIBMCDRIVER_CAMERA_ERROR_BUFFERTOOSMALL: return "a provided buffer is too small";
+    case LIBMCDRIVER_CAMERA_ERROR_GENERICEXCEPTION: return "a generic exception occurred";
+    case LIBMCDRIVER_CAMERA_ERROR_COULDNOTLOADLIBRARY: return "the library could not be loaded";
+    case LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT: return "a required exported symbol could not be found in the library";
+    case LIBMCDRIVER_CAMERA_ERROR_INCOMPATIBLEBINARYVERSION: return "the version of the binary interface does not match the bindings interface";
+    case LIBMCDRIVER_CAMERA_ERROR_INVALIDSTATENAME: return "invalid state name";
+    case LIBMCDRIVER_CAMERA_ERROR_DRIVERERROR: return "a driver error occured";
+    case LIBMCDRIVER_CAMERA_ERROR_ITERATORERROR: return "iterator does not point at valid object.";
+    default: return "unknown error";
+  }
+}
+
+/*************************************************************************************************************************
+ Declaration of handle classes 
+**************************************************************************************************************************/
+
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_Base;
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_Driver;
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_Iterator;
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_PNGImage;
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_Driver_Camera;
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_RaspiCameraDevice;
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_RaspiCameraDeviceIterator;
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_Driver_RaspiCamera;
+
+namespace LibMCDriver_Camera {
+
+  /*************************************************************************************************************************
+   Declaration of enums
+  **************************************************************************************************************************/
+  
+  enum class eImagePixelFormat : LibMCDriver_Camera_int32 {
+    Unknown = 0,
+    RGB32 = 1,
+    Grayscale32 = 2
+  };
+  
+} // namespace LibMCDriver_Camera;
+
+// define legacy C-names for enums, structs and function types
+typedef LibMCDriver_Camera::eImagePixelFormat eLibMCDriver_CameraImagePixelFormat;
+
+#endif // __LIBMCDRIVER_CAMERA_TYPES_HEADER_CPP
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera.cpp b/Drivers/Camera/Implementation/libmcdriver_camera.cpp
new file mode 100644
index 00000000..0bb6fb8d
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera.cpp
@@ -0,0 +1,87 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++ implementation file in order to allow easy
+development of MC Driver Camera. It needs to be generated only once.
+
+Interface version: 1.0.0
+
+*/
+
+#include "libmcdriver_camera_abi.hpp"
+#include "libmcdriver_camera_interfaces.hpp"
+#include "libmcdriver_camera_interfaceexception.hpp"
+#include "libmcdriver_camera_driver_raspicamera.hpp"
+
+using namespace LibMCDriver_Camera;
+using namespace LibMCDriver_Camera::Impl;
+
+// Injected Components
+LibMCDriverEnv::PWrapper CWrapper::sPLibMCDriverEnvWrapper;
+
+void CWrapper::GetVersion(LibMCDriver_Camera_uint32 & nMajor, LibMCDriver_Camera_uint32 & nMinor, LibMCDriver_Camera_uint32 & nMicro)
+{
+	nMajor = LIBMCDRIVER_CAMERA_VERSION_MAJOR;
+	nMinor = LIBMCDRIVER_CAMERA_VERSION_MINOR;
+	nMicro = LIBMCDRIVER_CAMERA_VERSION_MICRO;
+}
+
+bool CWrapper::GetLastError(IBase* pInstance, std::string & sErrorMessage)
+{
+	if (pInstance) {
+		return pInstance->GetLastErrorMessage (sErrorMessage);
+	} else {
+		return false;
+	}
+}
+
+void CWrapper::ReleaseInstance(IBase* pInstance)
+{
+	IBase::ReleaseBaseClassInterface(pInstance);
+}
+
+void CWrapper::AcquireInstance(IBase* pInstance)
+{
+	IBase::AcquireBaseClassInterface(pInstance);
+}
+
+IDriver * CWrapper::CreateDriver(const std::string & sName, const std::string & sType, LibMCDriverEnv::PDriverEnvironment pDriverEnvironment)
+{
+	if (sType == "raspi-camera-1.0") {
+
+		return new CDriver_RaspiCamera(sName, sType, pDriverEnvironment);
+
+	}
+
+	throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_DRIVERERROR);
+}
+
+
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_base.cpp b/Drivers/Camera/Implementation/libmcdriver_camera_base.cpp
new file mode 100644
index 00000000..6daac49a
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_base.cpp
@@ -0,0 +1,84 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CBase
+
+*/
+
+#include "libmcdriver_camera_base.hpp"
+#include "libmcdriver_camera_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibMCDriver_Camera::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CBase 
+**************************************************************************************************************************/
+
+bool CBase::GetLastErrorMessage(std::string & sErrorMessage)
+{
+	if (m_pLastError.get() != nullptr) {
+		sErrorMessage = *m_pLastError;
+		return true;
+	} else {
+		sErrorMessage = "";
+		return false;
+	}
+}
+
+void CBase::ClearErrorMessages()
+{
+	m_pLastError.reset();
+}
+
+void CBase::RegisterErrorMessage(const std::string & sErrorMessage)
+{
+	if (m_pLastError.get() == nullptr) {
+		m_pLastError.reset(new std::string());
+	}
+	*m_pLastError = sErrorMessage;
+}
+
+void CBase::IncRefCount()
+{
+	++m_nReferenceCount;
+}
+
+bool CBase::DecRefCount()
+{
+	m_nReferenceCount--;
+	if (!m_nReferenceCount) {
+		delete this;
+		return true;
+	}
+	return false;
+}
+
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_base.hpp b/Drivers/Camera/Implementation/libmcdriver_camera_base.hpp
new file mode 100644
index 00000000..36ce7d02
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_base.hpp
@@ -0,0 +1,97 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CBase
+
+*/
+
+
+#ifndef __LIBMCDRIVER_CAMERA_BASE
+#define __LIBMCDRIVER_CAMERA_BASE
+
+#include "libmcdriver_camera_interfaces.hpp"
+#include <vector>
+#include <list>
+#include <memory>
+
+
+// Include custom headers here.
+
+
+namespace LibMCDriver_Camera {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CBase 
+**************************************************************************************************************************/
+
+class CBase : public virtual IBase {
+private:
+
+	std::unique_ptr<std::string> m_pLastError;
+	uint32_t m_nReferenceCount = 1;
+
+	/**
+	* Put private members here.
+	*/
+
+protected:
+
+	/**
+	* Put protected members here.
+	*/
+
+public:
+
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
+
+	bool GetLastErrorMessage(std::string & sErrorMessage) override;
+
+	void ClearErrorMessages() override;
+
+	void RegisterErrorMessage(const std::string & sErrorMessage) override;
+
+	void IncRefCount() override;
+
+	bool DecRefCount() override;
+
+
+	/**
+	* Public member functions to implement.
+	*/
+
+};
+
+} // namespace Impl
+} // namespace LibMCDriver_Camera
+
+#endif // __LIBMCDRIVER_CAMERA_BASE
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_driver.cpp b/Drivers/Camera/Implementation/libmcdriver_camera_driver.cpp
new file mode 100644
index 00000000..c780f389
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_driver.cpp
@@ -0,0 +1,77 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CDriver
+
+*/
+
+#include "libmcdriver_camera_driver.hpp"
+#include "libmcdriver_camera_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibMCDriver_Camera::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CDriver 
+**************************************************************************************************************************/
+CDriver::CDriver()
+{
+
+}
+
+
+CDriver::CDriver(const std::string& sName, const std::string& sType)
+    : m_sName(sName), m_sType(sType)
+{
+}
+
+std::string CDriver::GetName()
+{
+    return m_sName;
+}
+
+std::string CDriver::GetType()
+{
+    return m_sType;
+}
+
+void CDriver::GetVersion(LibMCDriver_Camera_uint32& nMajor, LibMCDriver_Camera_uint32& nMinor, LibMCDriver_Camera_uint32& nMicro, std::string& sBuild)
+{
+
+}
+
+
+void CDriver::GetHeaderInformation(std::string& sNameSpace, std::string& sBaseName)
+{
+    sNameSpace = "LibMCDriver_Camera";
+    sBaseName = "libmcdriver_camera";
+}
+
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_driver.hpp b/Drivers/Camera/Implementation/libmcdriver_camera_driver.hpp
new file mode 100644
index 00000000..13587f41
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_driver.hpp
@@ -0,0 +1,87 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CDriver
+
+*/
+
+
+#ifndef __LIBMCDRIVER_CAMERA_DRIVER
+#define __LIBMCDRIVER_CAMERA_DRIVER
+
+#include "libmcdriver_camera_interfaces.hpp"
+
+// Parent classes
+#include "libmcdriver_camera_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibMCDriver_Camera {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CDriver 
+**************************************************************************************************************************/
+
+class CDriver : public virtual IDriver, public virtual CBase {
+private:
+
+
+protected:
+    std::string m_sName;
+    std::string m_sType;
+
+public:
+    CDriver();
+
+    CDriver(const std::string& sName, const std::string& sType);
+
+	std::string GetName() override;
+
+	std::string GetType() override;
+
+	void GetVersion(LibMCDriver_Camera_uint32 & nMajor, LibMCDriver_Camera_uint32 & nMinor, LibMCDriver_Camera_uint32 & nMicro, std::string & sBuild) override;
+
+	void GetHeaderInformation(std::string & sNameSpace, std::string & sBaseName) override;
+
+};
+
+} // namespace Impl
+} // namespace LibMCDriver_Camera
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBMCDRIVER_CAMERA_DRIVER
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_driver_camera.cpp b/Drivers/Camera/Implementation/libmcdriver_camera_driver_camera.cpp
new file mode 100644
index 00000000..4ad64f35
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_driver_camera.cpp
@@ -0,0 +1,52 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CDriver_Camera
+
+*/
+
+#include "libmcdriver_camera_driver_camera.hpp"
+#include "libmcdriver_camera_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibMCDriver_Camera::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CDriver_Camera 
+**************************************************************************************************************************/
+
+CDriver_Camera::CDriver_Camera(const std::string& sName, const std::string& sType)
+    : CDriver (sName, sType)
+{
+
+}
+
+
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_driver_camera.hpp b/Drivers/Camera/Implementation/libmcdriver_camera_driver_camera.hpp
new file mode 100644
index 00000000..3ab88d88
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_driver_camera.hpp
@@ -0,0 +1,79 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CDriver_Camera
+
+*/
+
+
+#ifndef __LIBMCDRIVER_CAMERA_DRIVER_CAMERA
+#define __LIBMCDRIVER_CAMERA_DRIVER_CAMERA
+
+#include "libmcdriver_camera_interfaces.hpp"
+
+// Parent classes
+#include "libmcdriver_camera_driver.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibMCDriver_Camera {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CDriver_Camera 
+**************************************************************************************************************************/
+
+class CDriver_Camera : public virtual IDriver_Camera, public virtual CDriver {
+private:
+
+
+protected:
+
+
+public:
+
+    CDriver_Camera (const std::string& sName, const std::string& sType);
+
+    virtual IPNGImage* CapturePNGImage() = 0;
+
+};
+
+} // namespace Impl
+} // namespace LibMCDriver_Camera
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBMCDRIVER_CAMERA_DRIVER_CAMERA
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_driver_raspicamera.cpp b/Drivers/Camera/Implementation/libmcdriver_camera_driver_raspicamera.cpp
new file mode 100644
index 00000000..0ad293a5
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_driver_raspicamera.cpp
@@ -0,0 +1,87 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CDriver_RaspiCamera
+
+*/
+
+#include "libmcdriver_camera_driver_raspicamera.hpp"
+#include "libmcdriver_camera_interfaceexception.hpp"
+#include "libmcdriver_camera_raspicameradeviceiterator.hpp"
+#include "libmcdriver_camera_pngimage.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibMCDriver_Camera::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CDriver_RaspiCamera 
+**************************************************************************************************************************/
+
+CDriver_RaspiCamera::CDriver_RaspiCamera(const std::string& sName, const std::string& sType, LibMCDriverEnv::PDriverEnvironment pDriverEnvironment)
+    : CDriver_Camera (sName, sType), m_pDriverEnvironment (pDriverEnvironment)
+{
+    if (pDriverEnvironment.get() == nullptr)
+        throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+
+}
+
+
+IRaspiCameraDeviceIterator* CDriver_RaspiCamera::QueryDevices() 
+{
+    auto pIterator = std::make_unique <CRaspiCameraDeviceIterator> ();
+    pIterator->addDevice("/dev/raspicamera0");
+
+    return pIterator.release();
+}
+
+void CDriver_RaspiCamera::Initialize(const std::string & sDeviceString, const LibMCDriver_Camera_uint32 nWidth, const LibMCDriver_Camera_uint32 nHeight, const LibMCDriver_Camera::eImagePixelFormat ePixelformat)
+{
+    // Successful
+
+}
+
+IPNGImage* CDriver_RaspiCamera::CapturePNGImage()
+{
+    auto pImage = std::make_unique<CPNGImage>(400, 300, eImagePixelFormat::RGB32);
+
+    std::vector <uint8_t>& pData = pImage->getBinaryData();
+
+    pData.push_back('t');
+    pData.push_back('e');
+    pData.push_back('s');
+    pData.push_back('t');
+    pData.push_back('1');
+    pData.push_back('2');
+    pData.push_back('3');
+
+    return pImage.release();
+}
+
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_driver_raspicamera.hpp b/Drivers/Camera/Implementation/libmcdriver_camera_driver_raspicamera.hpp
new file mode 100644
index 00000000..0f430200
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_driver_raspicamera.hpp
@@ -0,0 +1,83 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CDriver_RaspiCamera
+
+*/
+
+
+#ifndef __LIBMCDRIVER_CAMERA_DRIVER_RASPICAMERA
+#define __LIBMCDRIVER_CAMERA_DRIVER_RASPICAMERA
+
+#include "libmcdriver_camera_interfaces.hpp"
+
+// Parent classes
+#include "libmcdriver_camera_driver_camera.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibMCDriver_Camera {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CDriver_RaspiCamera 
+**************************************************************************************************************************/
+
+class CDriver_RaspiCamera : public virtual IDriver_RaspiCamera, public virtual CDriver_Camera {
+private:
+
+
+protected:
+    LibMCDriverEnv::PDriverEnvironment m_pDriverEnvironment;
+
+public:
+
+    CDriver_RaspiCamera(const std::string& sName, const std::string& sType, LibMCDriverEnv::PDriverEnvironment pDriverEnvironment);
+
+    IRaspiCameraDeviceIterator* QueryDevices() override;
+
+	void Initialize(const std::string & sDeviceString, const LibMCDriver_Camera_uint32 nWidth, const LibMCDriver_Camera_uint32 nHeight, const LibMCDriver_Camera::eImagePixelFormat ePixelformat) override;
+
+    IPNGImage* CapturePNGImage() override;
+
+};
+
+} // namespace Impl
+} // namespace LibMCDriver_Camera
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBMCDRIVER_CAMERA_DRIVER_RASPICAMERA
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_iterator.cpp b/Drivers/Camera/Implementation/libmcdriver_camera_iterator.cpp
new file mode 100644
index 00000000..424addc7
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_iterator.cpp
@@ -0,0 +1,70 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CIterator
+
+*/
+
+#include "libmcdriver_camera_iterator.hpp"
+#include "libmcdriver_camera_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibMCDriver_Camera::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CIterator 
+**************************************************************************************************************************/
+
+bool CIterator::MoveNext()
+{
+	throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_NOTIMPLEMENTED);
+}
+
+bool CIterator::MovePrevious()
+{
+	throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_NOTIMPLEMENTED);
+}
+
+IBase * CIterator::GetCurrent()
+{
+	throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_NOTIMPLEMENTED);
+}
+
+IIterator * CIterator::Clone()
+{
+	throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_NOTIMPLEMENTED);
+}
+
+LibMCDriver_Camera_uint64 CIterator::Count()
+{
+	throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_NOTIMPLEMENTED);
+}
+
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_iterator.hpp b/Drivers/Camera/Implementation/libmcdriver_camera_iterator.hpp
new file mode 100644
index 00000000..895df169
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_iterator.hpp
@@ -0,0 +1,83 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CIterator
+
+*/
+
+
+#ifndef __LIBMCDRIVER_CAMERA_ITERATOR
+#define __LIBMCDRIVER_CAMERA_ITERATOR
+
+#include "libmcdriver_camera_interfaces.hpp"
+
+// Parent classes
+#include "libmcdriver_camera_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibMCDriver_Camera {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CIterator 
+**************************************************************************************************************************/
+
+class CIterator : public virtual IIterator, public virtual CBase {
+private:
+
+protected:
+
+public:
+	
+    virtual bool MoveNext() = 0;
+
+    virtual bool MovePrevious() = 0;
+
+    virtual IBase * GetCurrent() = 0;
+
+    virtual IIterator * Clone() = 0;
+
+    virtual LibMCDriver_Camera_uint64 Count() = 0;
+
+};
+
+} // namespace Impl
+} // namespace LibMCDriver_Camera
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBMCDRIVER_CAMERA_ITERATOR
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_pngimage.cpp b/Drivers/Camera/Implementation/libmcdriver_camera_pngimage.cpp
new file mode 100644
index 00000000..9ad0627e
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_pngimage.cpp
@@ -0,0 +1,102 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CPNGImage
+
+*/
+
+#include "libmcdriver_camera_pngimage.hpp"
+#include "libmcdriver_camera_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibMCDriver_Camera::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CPNGImage 
+**************************************************************************************************************************/
+CPNGImage::CPNGImage(uint32_t nWidth, uint32_t nHeight, eImagePixelFormat ePixelFormat)
+    : m_nWidth (nWidth), m_nHeight (nHeight), m_ePixelFormat (ePixelFormat)
+{
+    if ((nWidth == 0) || (nHeight == 0) || (ePixelFormat == eImagePixelFormat::Unknown))
+        throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+
+
+}
+
+
+LibMCDriver_Camera_uint64 CPNGImage::GetWidth()
+{
+    return m_nWidth;
+}
+
+LibMCDriver_Camera_uint64 CPNGImage::GetHeight()
+{
+    return m_nHeight;
+}
+
+LibMCDriver_Camera::eImagePixelFormat CPNGImage::GetPixelFormat()
+{
+    return m_ePixelFormat;
+}
+
+void CPNGImage::GetRawData(LibMCDriver_Camera_uint64 nPNGDataBufferSize, LibMCDriver_Camera_uint64* pPNGDataNeededCount, LibMCDriver_Camera_uint8 * pPNGDataBuffer)
+{
+
+    size_t nSize = m_BinaryData.size();
+    if (pPNGDataNeededCount != nullptr)
+        *pPNGDataNeededCount = nSize;
+
+    if (pPNGDataBuffer != nullptr) {
+        if (nPNGDataBufferSize < nSize)
+            throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_BUFFERTOOSMALL);
+
+        if (nSize > 0) {
+            const uint8_t* pSrc = m_BinaryData.data();
+            uint8_t* pDst = pPNGDataBuffer;
+
+            for (size_t nIndex = 0; nIndex < nSize; nIndex++) {
+                *pDst = *pSrc;
+                pSrc++;
+                pDst++;
+            }
+        }
+    }
+}
+
+std::string CPNGImage::SaveToFile()
+{
+	throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_NOTIMPLEMENTED);
+}
+
+std::vector <uint8_t>& CPNGImage::getBinaryData()
+{
+    return m_BinaryData;
+}
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_pngimage.hpp b/Drivers/Camera/Implementation/libmcdriver_camera_pngimage.hpp
new file mode 100644
index 00000000..0c9d27d7
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_pngimage.hpp
@@ -0,0 +1,94 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CPNGImage
+
+*/
+
+
+#ifndef __LIBMCDRIVER_CAMERA_PNGIMAGE
+#define __LIBMCDRIVER_CAMERA_PNGIMAGE
+
+#include "libmcdriver_camera_interfaces.hpp"
+
+// Parent classes
+#include "libmcdriver_camera_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibMCDriver_Camera {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CPNGImage 
+**************************************************************************************************************************/
+
+class CPNGImage : public virtual IPNGImage, public virtual CBase {
+private:
+
+
+protected:
+
+    uint32_t m_nWidth;
+    uint32_t m_nHeight;
+    eImagePixelFormat m_ePixelFormat;
+
+    std::vector <uint8_t> m_BinaryData;
+
+public:
+
+    CPNGImage(uint32_t nWidth, uint32_t nHeight, eImagePixelFormat ePixelFormat);
+
+	LibMCDriver_Camera_uint64 GetWidth() override;
+
+	LibMCDriver_Camera_uint64 GetHeight() override;
+
+	LibMCDriver_Camera::eImagePixelFormat GetPixelFormat() override;
+
+	void GetRawData(LibMCDriver_Camera_uint64 nPNGDataBufferSize, LibMCDriver_Camera_uint64* pPNGDataNeededCount, LibMCDriver_Camera_uint8 * pPNGDataBuffer) override;
+
+	std::string SaveToFile() override;
+
+    std::vector <uint8_t> & getBinaryData ();
+
+};
+
+} // namespace Impl
+} // namespace LibMCDriver_Camera
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBMCDRIVER_CAMERA_PNGIMAGE
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_raspicameradevice.cpp b/Drivers/Camera/Implementation/libmcdriver_camera_raspicameradevice.cpp
new file mode 100644
index 00000000..b4266244
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_raspicameradevice.cpp
@@ -0,0 +1,58 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CRaspiCameraDevice
+
+*/
+
+#include "libmcdriver_camera_raspicameradevice.hpp"
+#include "libmcdriver_camera_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibMCDriver_Camera::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CRaspiCameraDevice 
+**************************************************************************************************************************/
+
+CRaspiCameraDevice::CRaspiCameraDevice(const std::string& sDeviceString)
+    : m_sDeviceString (sDeviceString)
+{
+    if (sDeviceString.empty())
+        throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+}
+
+
+std::string CRaspiCameraDevice::GetDeviceString()
+{
+    return m_sDeviceString;
+}
+
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_raspicameradevice.hpp b/Drivers/Camera/Implementation/libmcdriver_camera_raspicameradevice.hpp
new file mode 100644
index 00000000..30cabeb1
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_raspicameradevice.hpp
@@ -0,0 +1,80 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CRaspiCameraDevice
+
+*/
+
+
+#ifndef __LIBMCDRIVER_CAMERA_RASPICAMERADEVICE
+#define __LIBMCDRIVER_CAMERA_RASPICAMERADEVICE
+
+#include "libmcdriver_camera_interfaces.hpp"
+
+// Parent classes
+#include "libmcdriver_camera_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibMCDriver_Camera {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CRaspiCameraDevice 
+**************************************************************************************************************************/
+
+class CRaspiCameraDevice : public virtual IRaspiCameraDevice, public virtual CBase {
+private:
+
+
+
+protected:
+    std::string m_sDeviceString;
+
+public:
+
+    CRaspiCameraDevice (const std::string & sDeviceString);
+
+	std::string GetDeviceString() override;
+
+};
+
+} // namespace Impl
+} // namespace LibMCDriver_Camera
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBMCDRIVER_CAMERA_RASPICAMERADEVICE
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_raspicameradeviceiterator.cpp b/Drivers/Camera/Implementation/libmcdriver_camera_raspicameradeviceiterator.cpp
new file mode 100644
index 00000000..0e591410
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_raspicameradeviceiterator.cpp
@@ -0,0 +1,108 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CRaspiCameraDeviceIterator
+
+*/
+
+#include "libmcdriver_camera_raspicameradeviceiterator.hpp"
+#include "libmcdriver_camera_raspicameradevice.hpp"
+#include "libmcdriver_camera_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibMCDriver_Camera::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CRaspiCameraDeviceIterator 
+**************************************************************************************************************************/
+
+CRaspiCameraDeviceIterator::CRaspiCameraDeviceIterator()
+    : CIterator(), m_nCurrentIndex (-1)
+{
+
+}
+
+bool CRaspiCameraDeviceIterator::MoveNext()
+{
+    if ((m_nCurrentIndex + 1) < (int64_t) m_DeviceStrings.size()) {
+        m_nCurrentIndex++;
+        return true;
+    }
+
+    return false;
+}
+
+bool CRaspiCameraDeviceIterator::MovePrevious()
+{
+    if (m_nCurrentIndex > 0) {
+        m_nCurrentIndex--;
+        return true;
+    } 
+
+    return false;
+}
+
+IBase* CRaspiCameraDeviceIterator::GetCurrent()
+{
+    return (IBase*)GetCameraDevice();
+}
+
+IRaspiCameraDevice* CRaspiCameraDeviceIterator::GetCameraDevice()
+{
+    if ((m_nCurrentIndex >= 0) && (m_nCurrentIndex < (int64_t)m_DeviceStrings.size())) {
+        return new CRaspiCameraDevice(m_DeviceStrings [m_nCurrentIndex]);
+    }
+
+    throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_ITERATORERROR);
+}
+
+IIterator* CRaspiCameraDeviceIterator::Clone()
+{
+    std::unique_ptr<CRaspiCameraDeviceIterator> pNewIterator(new CRaspiCameraDeviceIterator());
+    pNewIterator->m_DeviceStrings = m_DeviceStrings;
+
+    return pNewIterator.release();
+}
+
+LibMCDriver_Camera_uint64 CRaspiCameraDeviceIterator::Count()
+{
+    return m_DeviceStrings.size();
+}
+
+void CRaspiCameraDeviceIterator::addDevice(const std::string& sDeviceString)
+{
+    if (sDeviceString.empty())
+        throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+
+    m_DeviceStrings.push_back(sDeviceString);
+}
+
+
diff --git a/Drivers/Camera/Implementation/libmcdriver_camera_raspicameradeviceiterator.hpp b/Drivers/Camera/Implementation/libmcdriver_camera_raspicameradeviceiterator.hpp
new file mode 100644
index 00000000..fbbe8b35
--- /dev/null
+++ b/Drivers/Camera/Implementation/libmcdriver_camera_raspicameradeviceiterator.hpp
@@ -0,0 +1,92 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CRaspiCameraDeviceIterator
+
+*/
+
+
+#ifndef __LIBMCDRIVER_CAMERA_RASPICAMERADEVICEITERATOR
+#define __LIBMCDRIVER_CAMERA_RASPICAMERADEVICEITERATOR
+
+#include "libmcdriver_camera_interfaces.hpp"
+
+// Parent classes
+#include "libmcdriver_camera_iterator.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibMCDriver_Camera {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CRaspiCameraDeviceIterator 
+**************************************************************************************************************************/
+
+class CRaspiCameraDeviceIterator : public virtual IRaspiCameraDeviceIterator, public virtual CIterator {
+private:
+
+protected:
+
+    std::vector <std::string> m_DeviceStrings;
+    int64_t m_nCurrentIndex;
+
+public:
+
+    CRaspiCameraDeviceIterator();
+
+    virtual bool MoveNext() override;
+
+    virtual bool MovePrevious() override;
+
+    virtual IBase* GetCurrent() override;
+
+    virtual IIterator* Clone() override;
+
+    virtual LibMCDriver_Camera_uint64 Count() override;
+
+	IRaspiCameraDevice * GetCameraDevice() override;
+
+    void addDevice (const std::string & sDeviceString);
+
+};
+
+} // namespace Impl
+} // namespace LibMCDriver_Camera
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBMCDRIVER_CAMERA_RASPICAMERADEVICEITERATOR
diff --git a/Drivers/Camera/Interfaces/libmcdriver_camera_abi.hpp b/Drivers/Camera/Interfaces/libmcdriver_camera_abi.hpp
new file mode 100644
index 00000000..305af7ff
--- /dev/null
+++ b/Drivers/Camera/Interfaces/libmcdriver_camera_abi.hpp
@@ -0,0 +1,361 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file in order to allow an easy
+ use of MC Driver Camera
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDRIVER_CAMERA_HEADER_CPP
+#define __LIBMCDRIVER_CAMERA_HEADER_CPP
+
+#ifdef __LIBMCDRIVER_CAMERA_EXPORTS
+#ifdef _WIN32
+#define LIBMCDRIVER_CAMERA_DECLSPEC __declspec (dllexport)
+#else // _WIN32
+#define LIBMCDRIVER_CAMERA_DECLSPEC __attribute__((visibility("default")))
+#endif // _WIN32
+#else // __LIBMCDRIVER_CAMERA_EXPORTS
+#define LIBMCDRIVER_CAMERA_DECLSPEC
+#endif // __LIBMCDRIVER_CAMERA_EXPORTS
+
+#include "libmcdriver_camera_types.hpp"
+
+#include "libmcdriverenv_dynamic.hpp"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*************************************************************************************************************************
+ Class definition for Base
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for Driver
+**************************************************************************************************************************/
+
+/**
+* returns the name identifier of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_driver_getname(LibMCDriver_Camera_Driver pDriver, const LibMCDriver_Camera_uint32 nNameBufferSize, LibMCDriver_Camera_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* returns the type identifier of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nTypeBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTypeBuffer -  buffer of Type of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_driver_gettype(LibMCDriver_Camera_Driver pDriver, const LibMCDriver_Camera_uint32 nTypeBufferSize, LibMCDriver_Camera_uint32* pTypeNeededChars, char * pTypeBuffer);
+
+/**
+* returns the version identifiers of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[out] pMajor - Major version.
+* @param[out] pMinor - Minor version.
+* @param[out] pMicro - Micro version.
+* @param[in] nBuildBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBuildNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBuildBuffer -  buffer of Build identifier., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_driver_getversion(LibMCDriver_Camera_Driver pDriver, LibMCDriver_Camera_uint32 * pMajor, LibMCDriver_Camera_uint32 * pMinor, LibMCDriver_Camera_uint32 * pMicro, const LibMCDriver_Camera_uint32 nBuildBufferSize, LibMCDriver_Camera_uint32* pBuildNeededChars, char * pBuildBuffer);
+
+/**
+* returns the header information
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nNameSpaceBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameSpaceNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameSpaceBuffer -  buffer of NameSpace of the driver., may be NULL
+* @param[in] nBaseNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBaseNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBaseNameBuffer -  buffer of BaseName of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_driver_getheaderinformation(LibMCDriver_Camera_Driver pDriver, const LibMCDriver_Camera_uint32 nNameSpaceBufferSize, LibMCDriver_Camera_uint32* pNameSpaceNeededChars, char * pNameSpaceBuffer, const LibMCDriver_Camera_uint32 nBaseNameBufferSize, LibMCDriver_Camera_uint32* pBaseNameNeededChars, char * pBaseNameBuffer);
+
+/*************************************************************************************************************************
+ Class definition for Iterator
+**************************************************************************************************************************/
+
+/**
+* Iterates to the next resource in the list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pHasNext - Iterates to the next resource in the list.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_iterator_movenext(LibMCDriver_Camera_Iterator pIterator, bool * pHasNext);
+
+/**
+* Iterates to the previous resource in the list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pHasPrevious - Iterates to the previous resource in the list.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_iterator_moveprevious(LibMCDriver_Camera_Iterator pIterator, bool * pHasPrevious);
+
+/**
+* Returns the resource the iterator points at.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pCurrentInstance - returns the resource instance.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_iterator_getcurrent(LibMCDriver_Camera_Iterator pIterator, LibMCDriver_Camera_Base * pCurrentInstance);
+
+/**
+* Creates a new resource iterator with the same resource list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pOutIterator - returns the cloned Iterator instance
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_iterator_clone(LibMCDriver_Camera_Iterator pIterator, LibMCDriver_Camera_Iterator * pOutIterator);
+
+/**
+* Returns the number of resources the iterator captures.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pCount - returns the number of resources the iterator captures.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_iterator_count(LibMCDriver_Camera_Iterator pIterator, LibMCDriver_Camera_uint64 * pCount);
+
+/*************************************************************************************************************************
+ Class definition for PNGImage
+**************************************************************************************************************************/
+
+/**
+* Returns width of the image.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[out] pWidth - width of the image in pixels.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_pngimage_getwidth(LibMCDriver_Camera_PNGImage pPNGImage, LibMCDriver_Camera_uint64 * pWidth);
+
+/**
+* Returns height of the image.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[out] pHeight - height of the image in pixels.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_pngimage_getheight(LibMCDriver_Camera_PNGImage pPNGImage, LibMCDriver_Camera_uint64 * pHeight);
+
+/**
+* Returns pixel format of the image.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[out] pPixelformat - Pixel format of the image.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_pngimage_getpixelformat(LibMCDriver_Camera_PNGImage pPNGImage, LibMCDriver_Camera::eImagePixelFormat * pPixelformat);
+
+/**
+* Returns raw data of the image.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[in] nPNGDataBufferSize - Number of elements in buffer
+* @param[out] pPNGDataNeededCount - will be filled with the count of the written elements, or needed buffer size.
+* @param[out] pPNGDataBuffer - uint8 buffer of Binary data of PNG image captured.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_pngimage_getrawdata(LibMCDriver_Camera_PNGImage pPNGImage, const LibMCDriver_Camera_uint64 nPNGDataBufferSize, LibMCDriver_Camera_uint64* pPNGDataNeededCount, LibMCDriver_Camera_uint8 * pPNGDataBuffer);
+
+/**
+* Saves PNG Image on Disk.
+*
+* @param[in] pPNGImage - PNGImage instance.
+* @param[in] nFileNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFileNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFileNameBuffer -  buffer of Filename to save PNG to., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_pngimage_savetofile(LibMCDriver_Camera_PNGImage pPNGImage, const LibMCDriver_Camera_uint32 nFileNameBufferSize, LibMCDriver_Camera_uint32* pFileNameNeededChars, char * pFileNameBuffer);
+
+/*************************************************************************************************************************
+ Class definition for Driver_Camera
+**************************************************************************************************************************/
+
+/**
+* Captures an image from the camera and returns a PNG image.
+*
+* @param[in] pDriver_Camera - Driver_Camera instance.
+* @param[out] pPNGImage - Instance of the PNG Image.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_driver_camera_capturepngimage(LibMCDriver_Camera_Driver_Camera pDriver_Camera, LibMCDriver_Camera_PNGImage * pPNGImage);
+
+/*************************************************************************************************************************
+ Class definition for RaspiCameraDevice
+**************************************************************************************************************************/
+
+/**
+* Returns path to the camera device.
+*
+* @param[in] pRaspiCameraDevice - RaspiCameraDevice instance.
+* @param[in] nDeviceStringBufferSize - size of the buffer (including trailing 0)
+* @param[out] pDeviceStringNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pDeviceStringBuffer -  buffer of Path to camera device., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_raspicameradevice_getdevicestring(LibMCDriver_Camera_RaspiCameraDevice pRaspiCameraDevice, const LibMCDriver_Camera_uint32 nDeviceStringBufferSize, LibMCDriver_Camera_uint32* pDeviceStringNeededChars, char * pDeviceStringBuffer);
+
+/*************************************************************************************************************************
+ Class definition for RaspiCameraDeviceIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the camera device the iterator points at.
+*
+* @param[in] pRaspiCameraDeviceIterator - RaspiCameraDeviceIterator instance.
+* @param[out] pCurrentInstance - returns the camera device instance.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_raspicameradeviceiterator_getcameradevice(LibMCDriver_Camera_RaspiCameraDeviceIterator pRaspiCameraDeviceIterator, LibMCDriver_Camera_RaspiCameraDevice * pCurrentInstance);
+
+/*************************************************************************************************************************
+ Class definition for Driver_RaspiCamera
+**************************************************************************************************************************/
+
+/**
+* Looks for cameras on the Raspberry PI.
+*
+* @param[in] pDriver_RaspiCamera - Driver_RaspiCamera instance.
+* @param[out] pDeviceIterator - Iterator Instance through all found devices.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_driver_raspicamera_querydevices(LibMCDriver_Camera_Driver_RaspiCamera pDriver_RaspiCamera, LibMCDriver_Camera_RaspiCameraDeviceIterator * pDeviceIterator);
+
+/**
+* Initialize the camera on the Raspberry PI.
+*
+* @param[in] pDriver_RaspiCamera - Driver_RaspiCamera instance.
+* @param[in] pDeviceString - Path to camera device.
+* @param[in] nWidth - Width of Image in Pixels.
+* @param[in] nHeight - Height of Image in Pixels.
+* @param[in] ePixelformat - Pixel format of the image.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_driver_raspicamera_initialize(LibMCDriver_Camera_Driver_RaspiCamera pDriver_RaspiCamera, const char * pDeviceString, LibMCDriver_Camera_uint32 nWidth, LibMCDriver_Camera_uint32 nHeight, LibMCDriver_Camera::eImagePixelFormat ePixelformat);
+
+/*************************************************************************************************************************
+ Global functions
+**************************************************************************************************************************/
+
+/**
+* retrieves the binary version of this library.
+*
+* @param[out] pMajor - returns the major version of this library
+* @param[out] pMinor - returns the minor version of this library
+* @param[out] pMicro - returns the micro version of this library
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_getversion(LibMCDriver_Camera_uint32 * pMajor, LibMCDriver_Camera_uint32 * pMinor, LibMCDriver_Camera_uint32 * pMicro);
+
+/**
+* Returns the last error recorded on this object
+*
+* @param[in] pInstance - Instance Handle
+* @param[in] nErrorMessageBufferSize - size of the buffer (including trailing 0)
+* @param[out] pErrorMessageNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pErrorMessageBuffer -  buffer of Message of the last error, may be NULL
+* @param[out] pHasError - Is there a last error to query
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_getlasterror(LibMCDriver_Camera_Base pInstance, const LibMCDriver_Camera_uint32 nErrorMessageBufferSize, LibMCDriver_Camera_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError);
+
+/**
+* Releases shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_releaseinstance(LibMCDriver_Camera_Base pInstance);
+
+/**
+* Acquires shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_acquireinstance(LibMCDriver_Camera_Base pInstance);
+
+/**
+* Injects an imported component for usage within this component
+*
+* @param[in] pNameSpace - NameSpace of the injected component
+* @param[in] pSymbolAddressMethod - Address of the SymbolAddressMethod of the injected component
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_injectcomponent(const char * pNameSpace, LibMCDriver_Camera_pvoid pSymbolAddressMethod);
+
+/**
+* Returns the address of the SymbolLookupMethod
+*
+* @param[out] pSymbolLookupMethod - Address of the SymbolAddressMethod
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_getsymbollookupmethod(LibMCDriver_Camera_pvoid * pSymbolLookupMethod);
+
+/**
+* Creates a driver instance with a specific name.
+*
+* @param[in] pName - Name of driver to be created.
+* @param[in] pType - Type of driver to be created.
+* @param[in] pDriverEnvironment - Environment of this driver.
+* @param[out] pInstance - New Driver instance
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_CAMERA_DECLSPEC LibMCDriver_CameraResult libmcdriver_camera_createdriver(const char * pName, const char * pType, LibMCDriverEnv_DriverEnvironment pDriverEnvironment, LibMCDriver_Camera_Driver * pInstance);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __LIBMCDRIVER_CAMERA_HEADER_CPP
+
diff --git a/Drivers/Camera/Interfaces/libmcdriver_camera_interfaceexception.cpp b/Drivers/Camera/Interfaces/libmcdriver_camera_interfaceexception.cpp
new file mode 100644
index 00000000..5d4eefec
--- /dev/null
+++ b/Drivers/Camera/Interfaces/libmcdriver_camera_interfaceexception.cpp
@@ -0,0 +1,68 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++ Implementation file with the basic internal
+ exception type in order to allow an easy use of MC Driver Camera
+
+Interface version: 1.0.0
+
+*/
+
+
+#include <string>
+
+#include "libmcdriver_camera_interfaceexception.hpp"
+
+/*************************************************************************************************************************
+ Class ELibMCDriver_CameraInterfaceException
+**************************************************************************************************************************/
+ELibMCDriver_CameraInterfaceException::ELibMCDriver_CameraInterfaceException(LibMCDriver_CameraResult errorCode)
+	: m_errorMessage(LIBMCDRIVER_CAMERA_GETERRORSTRING (errorCode))
+{
+	m_errorCode = errorCode;
+}
+
+ELibMCDriver_CameraInterfaceException::ELibMCDriver_CameraInterfaceException(LibMCDriver_CameraResult errorCode, std::string errorMessage)
+	: m_errorMessage(errorMessage + " (" + std::to_string (errorCode) + ")")
+{
+	m_errorCode = errorCode;
+}
+
+LibMCDriver_CameraResult ELibMCDriver_CameraInterfaceException::getErrorCode ()
+{
+	return m_errorCode;
+}
+
+const char * ELibMCDriver_CameraInterfaceException::what () const noexcept
+{
+	return m_errorMessage.c_str();
+}
+
diff --git a/Drivers/Camera/Interfaces/libmcdriver_camera_interfaceexception.hpp b/Drivers/Camera/Interfaces/libmcdriver_camera_interfaceexception.hpp
new file mode 100644
index 00000000..93eaf3b0
--- /dev/null
+++ b/Drivers/Camera/Interfaces/libmcdriver_camera_interfaceexception.hpp
@@ -0,0 +1,83 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++ Header file with the basic internal
+ exception type in order to allow an easy use of MC Driver Camera
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDRIVER_CAMERA_INTERFACEEXCEPTION_HEADER
+#define __LIBMCDRIVER_CAMERA_INTERFACEEXCEPTION_HEADER
+
+#include <exception>
+#include <stdexcept>
+#include "libmcdriver_camera_types.hpp"
+
+/*************************************************************************************************************************
+ Class ELibMCDriver_CameraInterfaceException
+**************************************************************************************************************************/
+
+
+class ELibMCDriver_CameraInterfaceException : public std::exception {
+protected:
+	/**
+	* Error code for the Exception.
+	*/
+	LibMCDriver_CameraResult m_errorCode;
+	/**
+	* Error message for the Exception.
+	*/
+	std::string m_errorMessage;
+
+public:
+	/**
+	* Exception Constructor.
+	*/
+	ELibMCDriver_CameraInterfaceException(LibMCDriver_CameraResult errorCode);
+
+	/**
+	* Custom Exception Constructor.
+	*/
+	ELibMCDriver_CameraInterfaceException(LibMCDriver_CameraResult errorCode, std::string errorMessage);
+
+	/**
+	* Returns error code
+	*/
+	LibMCDriver_CameraResult getErrorCode();
+	/**
+	* Returns error message
+	*/
+	const char* what() const noexcept override;
+};
+
+#endif // __LIBMCDRIVER_CAMERA_INTERFACEEXCEPTION_HEADER
diff --git a/Drivers/Camera/Interfaces/libmcdriver_camera_interfaces.hpp b/Drivers/Camera/Interfaces/libmcdriver_camera_interfaces.hpp
new file mode 100644
index 00000000..42060547
--- /dev/null
+++ b/Drivers/Camera/Interfaces/libmcdriver_camera_interfaces.hpp
@@ -0,0 +1,519 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++ header file in order to allow easy
+development of MC Driver Camera. The implementer of MC Driver Camera needs to
+derive concrete classes from the abstract classes in this header.
+
+Interface version: 1.0.0
+
+*/
+
+
+#ifndef __LIBMCDRIVER_CAMERA_CPPINTERFACES
+#define __LIBMCDRIVER_CAMERA_CPPINTERFACES
+
+#include <string>
+#include <memory>
+
+#include "libmcdriver_camera_types.hpp"
+
+
+#include "libmcdriverenv_dynamic.hpp"
+
+namespace LibMCDriver_Camera {
+namespace Impl {
+
+/**
+ Forward declarations of class interfaces
+*/
+class IBase;
+class IDriver;
+class IIterator;
+class IPNGImage;
+class IDriver_Camera;
+class IRaspiCameraDevice;
+class IRaspiCameraDeviceIterator;
+class IDriver_RaspiCamera;
+
+
+
+/*************************************************************************************************************************
+ Parameter Cache definitions
+**************************************************************************************************************************/
+
+class ParameterCache {
+	public:
+		virtual ~ParameterCache() {}
+};
+
+template <class T1> class ParameterCache_1 : public ParameterCache {
+	private:
+		T1 m_param1;
+	public:
+		ParameterCache_1 (const T1 & param1)
+			: m_param1 (param1)
+		{
+		}
+
+		void retrieveData (T1 & param1)
+		{
+			param1 = m_param1;
+		}
+};
+
+template <class T1, class T2> class ParameterCache_2 : public ParameterCache {
+	private:
+		T1 m_param1;
+		T2 m_param2;
+	public:
+		ParameterCache_2 (const T1 & param1, const T2 & param2)
+			: m_param1 (param1), m_param2 (param2)
+		{
+		}
+
+		void retrieveData (T1 & param1, T2 & param2)
+		{
+			param1 = m_param1;
+			param2 = m_param2;
+		}
+};
+
+template <class T1, class T2, class T3> class ParameterCache_3 : public ParameterCache {
+	private:
+		T1 m_param1;
+		T2 m_param2;
+		T3 m_param3;
+	public:
+		ParameterCache_3 (const T1 & param1, const T2 & param2, const T3 & param3)
+			: m_param1 (param1), m_param2 (param2), m_param3 (param3)
+		{
+		}
+
+		void retrieveData (T1 & param1, T2 & param2, T3 & param3)
+		{
+			param1 = m_param1;
+			param2 = m_param2;
+			param3 = m_param3;
+		}
+};
+
+template <class T1, class T2, class T3, class T4> class ParameterCache_4 : public ParameterCache {
+	private:
+		T1 m_param1;
+		T2 m_param2;
+		T3 m_param3;
+		T4 m_param4;
+	public:
+		ParameterCache_4 (const T1 & param1, const T2 & param2, const T3 & param3, const T4 & param4)
+			: m_param1 (param1), m_param2 (param2), m_param3 (param3), m_param4 (param4)
+		{
+		}
+
+		void retrieveData (T1 & param1, T2 & param2, T3 & param3, T4 & param4)
+		{
+			param1 = m_param1;
+			param2 = m_param2;
+			param3 = m_param3;
+			param4 = m_param4;
+		}
+};
+
+
+/*************************************************************************************************************************
+ Class interface for Base 
+**************************************************************************************************************************/
+
+class IBase {
+private:
+	std::unique_ptr<ParameterCache> m_ParameterCache;
+public:
+	/**
+	* IBase::~IBase - virtual destructor of IBase
+	*/
+	virtual ~IBase() {};
+
+	/**
+	* IBase::ReleaseBaseClassInterface - Releases ownership of a base class interface. Deletes the reference, if necessary.
+	* @param[in] pIBase - The base class instance to release
+	*/
+	static void ReleaseBaseClassInterface(IBase* pIBase)
+	{
+		if (pIBase) {
+			pIBase->DecRefCount();
+		}
+	};
+
+	/**
+	* IBase::AcquireBaseClassInterface - Acquires shared ownership of a base class interface.
+	* @param[in] pIBase - The base class instance to acquire
+	*/
+	static void AcquireBaseClassInterface(IBase* pIBase)
+	{
+		if (pIBase) {
+			pIBase->IncRefCount();
+		}
+	};
+
+
+	/**
+	* IBase::GetLastErrorMessage - Returns the last error registered of this class instance
+	* @param[out] sErrorMessage - Message of the last error registered
+	* @return Has an error been registered already
+	*/
+	virtual bool GetLastErrorMessage(std::string & sErrorMessage) = 0;
+
+	/**
+	* IBase::ClearErrorMessages - Clears all registered messages of this class instance
+	*/
+	virtual void ClearErrorMessages() = 0;
+
+	/**
+	* IBase::RegisterErrorMessage - Registers an error message with this class instance
+	* @param[in] sErrorMessage - Error message to register
+	*/
+	virtual void RegisterErrorMessage(const std::string & sErrorMessage) = 0;
+
+	/**
+	* IBase::IncRefCount - Increases the reference count of a class instance
+	*/
+	virtual void IncRefCount() = 0;
+
+	/**
+	* IBase::DecRefCount - Decreases the reference count of a class instance and free releases it, if the last reference has been removed
+	* @return Has the object been released
+	*/
+	virtual bool DecRefCount() = 0;
+
+	/**
+	* IBase::_setCache - set parameter cache of object
+	*/
+	void _setCache(ParameterCache * pCache)
+	{
+		m_ParameterCache.reset(pCache);
+	}
+
+	/**
+	* IBase::_getCache - returns parameter cache of object
+	*/
+	ParameterCache* _getCache()
+	{
+		return m_ParameterCache.get();
+	}
+
+};
+
+
+/**
+ Definition of a shared pointer class for IBase
+*/
+template<class T>
+class IBaseSharedPtr : public std::shared_ptr<T>
+{
+public:
+	explicit IBaseSharedPtr(T* t = nullptr)
+		: std::shared_ptr<T>(t, IBase::ReleaseBaseClassInterface)
+	{
+		t->IncRefCount();
+	}
+
+	// Reset function, as it also needs to properly set the deleter.
+	void reset(T* t = nullptr)
+	{
+		std::shared_ptr<T>::reset(t, IBase::ReleaseBaseClassInterface);
+	}
+
+	// Get-function that increases the Base class's reference count
+	T* getCoOwningPtr()
+	{
+		T* t = this->get();
+		t->IncRefCount();
+		return t;
+	}
+};
+
+
+typedef IBaseSharedPtr<IBase> PIBase;
+
+
+/*************************************************************************************************************************
+ Class interface for Driver 
+**************************************************************************************************************************/
+
+class IDriver : public virtual IBase {
+public:
+	/**
+	* IDriver::GetName - returns the name identifier of the driver
+	* @return Name of the driver.
+	*/
+	virtual std::string GetName() = 0;
+
+	/**
+	* IDriver::GetType - returns the type identifier of the driver
+	* @return Type of the driver.
+	*/
+	virtual std::string GetType() = 0;
+
+	/**
+	* IDriver::GetVersion - returns the version identifiers of the driver
+	* @param[out] nMajor - Major version.
+	* @param[out] nMinor - Minor version.
+	* @param[out] nMicro - Micro version.
+	* @param[out] sBuild - Build identifier.
+	*/
+	virtual void GetVersion(LibMCDriver_Camera_uint32 & nMajor, LibMCDriver_Camera_uint32 & nMinor, LibMCDriver_Camera_uint32 & nMicro, std::string & sBuild) = 0;
+
+	/**
+	* IDriver::GetHeaderInformation - returns the header information
+	* @param[out] sNameSpace - NameSpace of the driver.
+	* @param[out] sBaseName - BaseName of the driver.
+	*/
+	virtual void GetHeaderInformation(std::string & sNameSpace, std::string & sBaseName) = 0;
+
+};
+
+typedef IBaseSharedPtr<IDriver> PIDriver;
+
+
+/*************************************************************************************************************************
+ Class interface for Iterator 
+**************************************************************************************************************************/
+
+class IIterator : public virtual IBase {
+public:
+	/**
+	* IIterator::MoveNext - Iterates to the next resource in the list.
+	* @return Iterates to the next resource in the list.
+	*/
+	virtual bool MoveNext() = 0;
+
+	/**
+	* IIterator::MovePrevious - Iterates to the previous resource in the list.
+	* @return Iterates to the previous resource in the list.
+	*/
+	virtual bool MovePrevious() = 0;
+
+	/**
+	* IIterator::GetCurrent - Returns the resource the iterator points at.
+	* @return returns the resource instance.
+	*/
+	virtual IBase * GetCurrent() = 0;
+
+	/**
+	* IIterator::Clone - Creates a new resource iterator with the same resource list.
+	* @return returns the cloned Iterator instance
+	*/
+	virtual IIterator * Clone() = 0;
+
+	/**
+	* IIterator::Count - Returns the number of resources the iterator captures.
+	* @return returns the number of resources the iterator captures.
+	*/
+	virtual LibMCDriver_Camera_uint64 Count() = 0;
+
+};
+
+typedef IBaseSharedPtr<IIterator> PIIterator;
+
+
+/*************************************************************************************************************************
+ Class interface for PNGImage 
+**************************************************************************************************************************/
+
+class IPNGImage : public virtual IBase {
+public:
+	/**
+	* IPNGImage::GetWidth - Returns width of the image.
+	* @return width of the image in pixels.
+	*/
+	virtual LibMCDriver_Camera_uint64 GetWidth() = 0;
+
+	/**
+	* IPNGImage::GetHeight - Returns height of the image.
+	* @return height of the image in pixels.
+	*/
+	virtual LibMCDriver_Camera_uint64 GetHeight() = 0;
+
+	/**
+	* IPNGImage::GetPixelFormat - Returns pixel format of the image.
+	* @return Pixel format of the image.
+	*/
+	virtual LibMCDriver_Camera::eImagePixelFormat GetPixelFormat() = 0;
+
+	/**
+	* IPNGImage::GetRawData - Returns raw data of the image.
+	* @param[in] nPNGDataBufferSize - Number of elements in buffer
+	* @param[out] pPNGDataNeededCount - will be filled with the count of the written structs, or needed buffer size.
+	* @param[out] pPNGDataBuffer - uint8 buffer of Binary data of PNG image captured.
+	*/
+	virtual void GetRawData(LibMCDriver_Camera_uint64 nPNGDataBufferSize, LibMCDriver_Camera_uint64* pPNGDataNeededCount, LibMCDriver_Camera_uint8 * pPNGDataBuffer) = 0;
+
+	/**
+	* IPNGImage::SaveToFile - Saves PNG Image on Disk.
+	* @return Filename to save PNG to.
+	*/
+	virtual std::string SaveToFile() = 0;
+
+};
+
+typedef IBaseSharedPtr<IPNGImage> PIPNGImage;
+
+
+/*************************************************************************************************************************
+ Class interface for Driver_Camera 
+**************************************************************************************************************************/
+
+class IDriver_Camera : public virtual IDriver {
+public:
+	/**
+	* IDriver_Camera::CapturePNGImage - Captures an image from the camera and returns a PNG image.
+	* @return Instance of the PNG Image.
+	*/
+	virtual IPNGImage * CapturePNGImage() = 0;
+
+};
+
+typedef IBaseSharedPtr<IDriver_Camera> PIDriver_Camera;
+
+
+/*************************************************************************************************************************
+ Class interface for RaspiCameraDevice 
+**************************************************************************************************************************/
+
+class IRaspiCameraDevice : public virtual IBase {
+public:
+	/**
+	* IRaspiCameraDevice::GetDeviceString - Returns path to the camera device.
+	* @return Path to camera device.
+	*/
+	virtual std::string GetDeviceString() = 0;
+
+};
+
+typedef IBaseSharedPtr<IRaspiCameraDevice> PIRaspiCameraDevice;
+
+
+/*************************************************************************************************************************
+ Class interface for RaspiCameraDeviceIterator 
+**************************************************************************************************************************/
+
+class IRaspiCameraDeviceIterator : public virtual IIterator {
+public:
+	/**
+	* IRaspiCameraDeviceIterator::GetCameraDevice - Returns the camera device the iterator points at.
+	* @return returns the camera device instance.
+	*/
+	virtual IRaspiCameraDevice * GetCameraDevice() = 0;
+
+};
+
+typedef IBaseSharedPtr<IRaspiCameraDeviceIterator> PIRaspiCameraDeviceIterator;
+
+
+/*************************************************************************************************************************
+ Class interface for Driver_RaspiCamera 
+**************************************************************************************************************************/
+
+class IDriver_RaspiCamera : public virtual IDriver_Camera {
+public:
+	/**
+	* IDriver_RaspiCamera::QueryDevices - Looks for cameras on the Raspberry PI.
+	* @return Iterator Instance through all found devices.
+	*/
+	virtual IRaspiCameraDeviceIterator * QueryDevices() = 0;
+
+	/**
+	* IDriver_RaspiCamera::Initialize - Initialize the camera on the Raspberry PI.
+	* @param[in] sDeviceString - Path to camera device.
+	* @param[in] nWidth - Width of Image in Pixels.
+	* @param[in] nHeight - Height of Image in Pixels.
+	* @param[in] ePixelformat - Pixel format of the image.
+	*/
+	virtual void Initialize(const std::string & sDeviceString, const LibMCDriver_Camera_uint32 nWidth, const LibMCDriver_Camera_uint32 nHeight, const LibMCDriver_Camera::eImagePixelFormat ePixelformat) = 0;
+
+};
+
+typedef IBaseSharedPtr<IDriver_RaspiCamera> PIDriver_RaspiCamera;
+
+
+/*************************************************************************************************************************
+ Global functions declarations
+**************************************************************************************************************************/
+class CWrapper {
+public:
+	// Injected Components
+	static LibMCDriverEnv::PWrapper sPLibMCDriverEnvWrapper;
+
+	/**
+	* Ilibmcdriver_camera::GetVersion - retrieves the binary version of this library.
+	* @param[out] nMajor - returns the major version of this library
+	* @param[out] nMinor - returns the minor version of this library
+	* @param[out] nMicro - returns the micro version of this library
+	*/
+	static void GetVersion(LibMCDriver_Camera_uint32 & nMajor, LibMCDriver_Camera_uint32 & nMinor, LibMCDriver_Camera_uint32 & nMicro);
+
+	/**
+	* Ilibmcdriver_camera::GetLastError - Returns the last error recorded on this object
+	* @param[in] pInstance - Instance Handle
+	* @param[out] sErrorMessage - Message of the last error
+	* @return Is there a last error to query
+	*/
+	static bool GetLastError(IBase* pInstance, std::string & sErrorMessage);
+
+	/**
+	* Ilibmcdriver_camera::ReleaseInstance - Releases shared ownership of an Instance
+	* @param[in] pInstance - Instance Handle
+	*/
+	static void ReleaseInstance(IBase* pInstance);
+
+	/**
+	* Ilibmcdriver_camera::AcquireInstance - Acquires shared ownership of an Instance
+	* @param[in] pInstance - Instance Handle
+	*/
+	static void AcquireInstance(IBase* pInstance);
+
+	/**
+	* Ilibmcdriver_camera::CreateDriver - Creates a driver instance with a specific name.
+	* @param[in] sName - Name of driver to be created.
+	* @param[in] sType - Type of driver to be created.
+	* @param[in] pDriverEnvironment - Environment of this driver.
+	* @return New Driver instance
+	*/
+	static IDriver * CreateDriver(const std::string & sName, const std::string & sType, LibMCDriverEnv::PDriverEnvironment pDriverEnvironment);
+
+};
+
+LibMCDriver_CameraResult LibMCDriver_Camera_GetProcAddress (const char * pProcName, void ** ppProcAddress);
+
+} // namespace Impl
+} // namespace LibMCDriver_Camera
+
+#endif // __LIBMCDRIVER_CAMERA_CPPINTERFACES
diff --git a/Drivers/Camera/Interfaces/libmcdriver_camera_interfacewrapper.cpp b/Drivers/Camera/Interfaces/libmcdriver_camera_interfacewrapper.cpp
new file mode 100644
index 00000000..2d10d4a3
--- /dev/null
+++ b/Drivers/Camera/Interfaces/libmcdriver_camera_interfacewrapper.cpp
@@ -0,0 +1,1047 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++ implementation file in order to allow easy
+development of MC Driver Camera. The functions in this file need to be implemented. It needs to be generated only once.
+
+Interface version: 1.0.0
+
+*/
+
+#include "libmcdriver_camera_abi.hpp"
+#include "libmcdriver_camera_interfaces.hpp"
+#include "libmcdriver_camera_interfaceexception.hpp"
+
+#include <map>
+
+using namespace LibMCDriver_Camera::Impl;
+
+LibMCDriver_CameraResult handleLibMCDriver_CameraException(IBase * pIBaseClass, ELibMCDriver_CameraInterfaceException & Exception)
+{
+	LibMCDriver_CameraResult errorCode = Exception.getErrorCode();
+
+	if (pIBaseClass != nullptr)
+		pIBaseClass->RegisterErrorMessage(Exception.what());
+
+	return errorCode;
+}
+
+LibMCDriver_CameraResult handleStdException(IBase * pIBaseClass, std::exception & Exception)
+{
+	LibMCDriver_CameraResult errorCode = LIBMCDRIVER_CAMERA_ERROR_GENERICEXCEPTION;
+
+	if (pIBaseClass != nullptr)
+		pIBaseClass->RegisterErrorMessage(Exception.what());
+
+	return errorCode;
+}
+
+LibMCDriver_CameraResult handleUnhandledException(IBase * pIBaseClass)
+{
+	LibMCDriver_CameraResult errorCode = LIBMCDRIVER_CAMERA_ERROR_GENERICEXCEPTION;
+
+	if (pIBaseClass != nullptr)
+		pIBaseClass->RegisterErrorMessage("Unhandled Exception");
+
+	return errorCode;
+}
+
+
+
+/*************************************************************************************************************************
+ Class implementation for Base
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class implementation for Driver
+**************************************************************************************************************************/
+LibMCDriver_CameraResult libmcdriver_camera_driver_getname(LibMCDriver_Camera_Driver pDriver, const LibMCDriver_Camera_uint32 nNameBufferSize, LibMCDriver_Camera_uint32* pNameNeededChars, char * pNameBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pDriver;
+
+	try {
+		if ( (!pNameBuffer) && !(pNameNeededChars) )
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		std::string sName("");
+		IDriver* pIDriver = dynamic_cast<IDriver*>(pIBaseClass);
+		if (!pIDriver)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pNameBuffer == nullptr);
+		if (isCacheCall) {
+			sName = pIDriver->GetName();
+
+			pIDriver->_setCache (new ParameterCache_1<std::string> (sName));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIDriver->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+			cache->retrieveData (sName);
+			pIDriver->_setCache (nullptr);
+		}
+		
+		if (pNameNeededChars)
+			*pNameNeededChars = (LibMCDriver_Camera_uint32) (sName.size()+1);
+		if (pNameBuffer) {
+			if (sName.size() >= nNameBufferSize)
+				throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_BUFFERTOOSMALL);
+			for (size_t iName = 0; iName < sName.size(); iName++)
+				pNameBuffer[iName] = sName[iName];
+			pNameBuffer[sName.size()] = 0;
+		}
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_driver_gettype(LibMCDriver_Camera_Driver pDriver, const LibMCDriver_Camera_uint32 nTypeBufferSize, LibMCDriver_Camera_uint32* pTypeNeededChars, char * pTypeBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pDriver;
+
+	try {
+		if ( (!pTypeBuffer) && !(pTypeNeededChars) )
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		std::string sType("");
+		IDriver* pIDriver = dynamic_cast<IDriver*>(pIBaseClass);
+		if (!pIDriver)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pTypeBuffer == nullptr);
+		if (isCacheCall) {
+			sType = pIDriver->GetType();
+
+			pIDriver->_setCache (new ParameterCache_1<std::string> (sType));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIDriver->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+			cache->retrieveData (sType);
+			pIDriver->_setCache (nullptr);
+		}
+		
+		if (pTypeNeededChars)
+			*pTypeNeededChars = (LibMCDriver_Camera_uint32) (sType.size()+1);
+		if (pTypeBuffer) {
+			if (sType.size() >= nTypeBufferSize)
+				throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_BUFFERTOOSMALL);
+			for (size_t iType = 0; iType < sType.size(); iType++)
+				pTypeBuffer[iType] = sType[iType];
+			pTypeBuffer[sType.size()] = 0;
+		}
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_driver_getversion(LibMCDriver_Camera_Driver pDriver, LibMCDriver_Camera_uint32 * pMajor, LibMCDriver_Camera_uint32 * pMinor, LibMCDriver_Camera_uint32 * pMicro, const LibMCDriver_Camera_uint32 nBuildBufferSize, LibMCDriver_Camera_uint32* pBuildNeededChars, char * pBuildBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pDriver;
+
+	try {
+		if (!pMajor)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		if (!pMinor)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		if (!pMicro)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		if ( (!pBuildBuffer) && !(pBuildNeededChars) )
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		std::string sBuild("");
+		IDriver* pIDriver = dynamic_cast<IDriver*>(pIBaseClass);
+		if (!pIDriver)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pBuildBuffer == nullptr);
+		if (isCacheCall) {
+			pIDriver->GetVersion(*pMajor, *pMinor, *pMicro, sBuild);
+
+			pIDriver->_setCache (new ParameterCache_4<LibMCDriver_Camera_uint32, LibMCDriver_Camera_uint32, LibMCDriver_Camera_uint32, std::string> (*pMajor, *pMinor, *pMicro, sBuild));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_4<LibMCDriver_Camera_uint32, LibMCDriver_Camera_uint32, LibMCDriver_Camera_uint32, std::string>*> (pIDriver->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+			cache->retrieveData (*pMajor, *pMinor, *pMicro, sBuild);
+			pIDriver->_setCache (nullptr);
+		}
+		
+		if (pBuildNeededChars)
+			*pBuildNeededChars = (LibMCDriver_Camera_uint32) (sBuild.size()+1);
+		if (pBuildBuffer) {
+			if (sBuild.size() >= nBuildBufferSize)
+				throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_BUFFERTOOSMALL);
+			for (size_t iBuild = 0; iBuild < sBuild.size(); iBuild++)
+				pBuildBuffer[iBuild] = sBuild[iBuild];
+			pBuildBuffer[sBuild.size()] = 0;
+		}
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_driver_getheaderinformation(LibMCDriver_Camera_Driver pDriver, const LibMCDriver_Camera_uint32 nNameSpaceBufferSize, LibMCDriver_Camera_uint32* pNameSpaceNeededChars, char * pNameSpaceBuffer, const LibMCDriver_Camera_uint32 nBaseNameBufferSize, LibMCDriver_Camera_uint32* pBaseNameNeededChars, char * pBaseNameBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pDriver;
+
+	try {
+		if ( (!pNameSpaceBuffer) && !(pNameSpaceNeededChars) )
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		if ( (!pBaseNameBuffer) && !(pBaseNameNeededChars) )
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		std::string sNameSpace("");
+		std::string sBaseName("");
+		IDriver* pIDriver = dynamic_cast<IDriver*>(pIBaseClass);
+		if (!pIDriver)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pNameSpaceBuffer == nullptr) || (pBaseNameBuffer == nullptr);
+		if (isCacheCall) {
+			pIDriver->GetHeaderInformation(sNameSpace, sBaseName);
+
+			pIDriver->_setCache (new ParameterCache_2<std::string, std::string> (sNameSpace, sBaseName));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_2<std::string, std::string>*> (pIDriver->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+			cache->retrieveData (sNameSpace, sBaseName);
+			pIDriver->_setCache (nullptr);
+		}
+		
+		if (pNameSpaceNeededChars)
+			*pNameSpaceNeededChars = (LibMCDriver_Camera_uint32) (sNameSpace.size()+1);
+		if (pNameSpaceBuffer) {
+			if (sNameSpace.size() >= nNameSpaceBufferSize)
+				throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_BUFFERTOOSMALL);
+			for (size_t iNameSpace = 0; iNameSpace < sNameSpace.size(); iNameSpace++)
+				pNameSpaceBuffer[iNameSpace] = sNameSpace[iNameSpace];
+			pNameSpaceBuffer[sNameSpace.size()] = 0;
+		}
+		if (pBaseNameNeededChars)
+			*pBaseNameNeededChars = (LibMCDriver_Camera_uint32) (sBaseName.size()+1);
+		if (pBaseNameBuffer) {
+			if (sBaseName.size() >= nBaseNameBufferSize)
+				throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_BUFFERTOOSMALL);
+			for (size_t iBaseName = 0; iBaseName < sBaseName.size(); iBaseName++)
+				pBaseNameBuffer[iBaseName] = sBaseName[iBaseName];
+			pBaseNameBuffer[sBaseName.size()] = 0;
+		}
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for Iterator
+**************************************************************************************************************************/
+LibMCDriver_CameraResult libmcdriver_camera_iterator_movenext(LibMCDriver_Camera_Iterator pIterator, bool * pHasNext)
+{
+	IBase* pIBaseClass = (IBase *)pIterator;
+
+	try {
+		if (pHasNext == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		IIterator* pIIterator = dynamic_cast<IIterator*>(pIBaseClass);
+		if (!pIIterator)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		*pHasNext = pIIterator->MoveNext();
+
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_iterator_moveprevious(LibMCDriver_Camera_Iterator pIterator, bool * pHasPrevious)
+{
+	IBase* pIBaseClass = (IBase *)pIterator;
+
+	try {
+		if (pHasPrevious == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		IIterator* pIIterator = dynamic_cast<IIterator*>(pIBaseClass);
+		if (!pIIterator)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		*pHasPrevious = pIIterator->MovePrevious();
+
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_iterator_getcurrent(LibMCDriver_Camera_Iterator pIterator, LibMCDriver_Camera_Base * pCurrentInstance)
+{
+	IBase* pIBaseClass = (IBase *)pIterator;
+
+	try {
+		if (pCurrentInstance == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		IBase* pBaseCurrentInstance(nullptr);
+		IIterator* pIIterator = dynamic_cast<IIterator*>(pIBaseClass);
+		if (!pIIterator)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		pBaseCurrentInstance = pIIterator->GetCurrent();
+
+		*pCurrentInstance = (IBase*)(pBaseCurrentInstance);
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_iterator_clone(LibMCDriver_Camera_Iterator pIterator, LibMCDriver_Camera_Iterator * pOutIterator)
+{
+	IBase* pIBaseClass = (IBase *)pIterator;
+
+	try {
+		if (pOutIterator == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		IBase* pBaseOutIterator(nullptr);
+		IIterator* pIIterator = dynamic_cast<IIterator*>(pIBaseClass);
+		if (!pIIterator)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		pBaseOutIterator = pIIterator->Clone();
+
+		*pOutIterator = (IBase*)(pBaseOutIterator);
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_iterator_count(LibMCDriver_Camera_Iterator pIterator, LibMCDriver_Camera_uint64 * pCount)
+{
+	IBase* pIBaseClass = (IBase *)pIterator;
+
+	try {
+		if (pCount == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		IIterator* pIIterator = dynamic_cast<IIterator*>(pIBaseClass);
+		if (!pIIterator)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		*pCount = pIIterator->Count();
+
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for PNGImage
+**************************************************************************************************************************/
+LibMCDriver_CameraResult libmcdriver_camera_pngimage_getwidth(LibMCDriver_Camera_PNGImage pPNGImage, LibMCDriver_Camera_uint64 * pWidth)
+{
+	IBase* pIBaseClass = (IBase *)pPNGImage;
+
+	try {
+		if (pWidth == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		IPNGImage* pIPNGImage = dynamic_cast<IPNGImage*>(pIBaseClass);
+		if (!pIPNGImage)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		*pWidth = pIPNGImage->GetWidth();
+
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_pngimage_getheight(LibMCDriver_Camera_PNGImage pPNGImage, LibMCDriver_Camera_uint64 * pHeight)
+{
+	IBase* pIBaseClass = (IBase *)pPNGImage;
+
+	try {
+		if (pHeight == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		IPNGImage* pIPNGImage = dynamic_cast<IPNGImage*>(pIBaseClass);
+		if (!pIPNGImage)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		*pHeight = pIPNGImage->GetHeight();
+
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_pngimage_getpixelformat(LibMCDriver_Camera_PNGImage pPNGImage, eLibMCDriver_CameraImagePixelFormat * pPixelformat)
+{
+	IBase* pIBaseClass = (IBase *)pPNGImage;
+
+	try {
+		if (pPixelformat == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		IPNGImage* pIPNGImage = dynamic_cast<IPNGImage*>(pIBaseClass);
+		if (!pIPNGImage)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		*pPixelformat = pIPNGImage->GetPixelFormat();
+
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_pngimage_getrawdata(LibMCDriver_Camera_PNGImage pPNGImage, const LibMCDriver_Camera_uint64 nPNGDataBufferSize, LibMCDriver_Camera_uint64* pPNGDataNeededCount, LibMCDriver_Camera_uint8 * pPNGDataBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pPNGImage;
+
+	try {
+		if ((!pPNGDataBuffer) && !(pPNGDataNeededCount))
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		IPNGImage* pIPNGImage = dynamic_cast<IPNGImage*>(pIBaseClass);
+		if (!pIPNGImage)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		pIPNGImage->GetRawData(nPNGDataBufferSize, pPNGDataNeededCount, pPNGDataBuffer);
+
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_pngimage_savetofile(LibMCDriver_Camera_PNGImage pPNGImage, const LibMCDriver_Camera_uint32 nFileNameBufferSize, LibMCDriver_Camera_uint32* pFileNameNeededChars, char * pFileNameBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pPNGImage;
+
+	try {
+		if ( (!pFileNameBuffer) && !(pFileNameNeededChars) )
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		std::string sFileName("");
+		IPNGImage* pIPNGImage = dynamic_cast<IPNGImage*>(pIBaseClass);
+		if (!pIPNGImage)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pFileNameBuffer == nullptr);
+		if (isCacheCall) {
+			sFileName = pIPNGImage->SaveToFile();
+
+			pIPNGImage->_setCache (new ParameterCache_1<std::string> (sFileName));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIPNGImage->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+			cache->retrieveData (sFileName);
+			pIPNGImage->_setCache (nullptr);
+		}
+		
+		if (pFileNameNeededChars)
+			*pFileNameNeededChars = (LibMCDriver_Camera_uint32) (sFileName.size()+1);
+		if (pFileNameBuffer) {
+			if (sFileName.size() >= nFileNameBufferSize)
+				throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_BUFFERTOOSMALL);
+			for (size_t iFileName = 0; iFileName < sFileName.size(); iFileName++)
+				pFileNameBuffer[iFileName] = sFileName[iFileName];
+			pFileNameBuffer[sFileName.size()] = 0;
+		}
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for Driver_Camera
+**************************************************************************************************************************/
+LibMCDriver_CameraResult libmcdriver_camera_driver_camera_capturepngimage(LibMCDriver_Camera_Driver_Camera pDriver_Camera, LibMCDriver_Camera_PNGImage * pPNGImage)
+{
+	IBase* pIBaseClass = (IBase *)pDriver_Camera;
+
+	try {
+		if (pPNGImage == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		IBase* pBasePNGImage(nullptr);
+		IDriver_Camera* pIDriver_Camera = dynamic_cast<IDriver_Camera*>(pIBaseClass);
+		if (!pIDriver_Camera)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		pBasePNGImage = pIDriver_Camera->CapturePNGImage();
+
+		*pPNGImage = (IBase*)(pBasePNGImage);
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for RaspiCameraDevice
+**************************************************************************************************************************/
+LibMCDriver_CameraResult libmcdriver_camera_raspicameradevice_getdevicestring(LibMCDriver_Camera_RaspiCameraDevice pRaspiCameraDevice, const LibMCDriver_Camera_uint32 nDeviceStringBufferSize, LibMCDriver_Camera_uint32* pDeviceStringNeededChars, char * pDeviceStringBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pRaspiCameraDevice;
+
+	try {
+		if ( (!pDeviceStringBuffer) && !(pDeviceStringNeededChars) )
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		std::string sDeviceString("");
+		IRaspiCameraDevice* pIRaspiCameraDevice = dynamic_cast<IRaspiCameraDevice*>(pIBaseClass);
+		if (!pIRaspiCameraDevice)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pDeviceStringBuffer == nullptr);
+		if (isCacheCall) {
+			sDeviceString = pIRaspiCameraDevice->GetDeviceString();
+
+			pIRaspiCameraDevice->_setCache (new ParameterCache_1<std::string> (sDeviceString));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIRaspiCameraDevice->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+			cache->retrieveData (sDeviceString);
+			pIRaspiCameraDevice->_setCache (nullptr);
+		}
+		
+		if (pDeviceStringNeededChars)
+			*pDeviceStringNeededChars = (LibMCDriver_Camera_uint32) (sDeviceString.size()+1);
+		if (pDeviceStringBuffer) {
+			if (sDeviceString.size() >= nDeviceStringBufferSize)
+				throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_BUFFERTOOSMALL);
+			for (size_t iDeviceString = 0; iDeviceString < sDeviceString.size(); iDeviceString++)
+				pDeviceStringBuffer[iDeviceString] = sDeviceString[iDeviceString];
+			pDeviceStringBuffer[sDeviceString.size()] = 0;
+		}
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for RaspiCameraDeviceIterator
+**************************************************************************************************************************/
+LibMCDriver_CameraResult libmcdriver_camera_raspicameradeviceiterator_getcameradevice(LibMCDriver_Camera_RaspiCameraDeviceIterator pRaspiCameraDeviceIterator, LibMCDriver_Camera_RaspiCameraDevice * pCurrentInstance)
+{
+	IBase* pIBaseClass = (IBase *)pRaspiCameraDeviceIterator;
+
+	try {
+		if (pCurrentInstance == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		IBase* pBaseCurrentInstance(nullptr);
+		IRaspiCameraDeviceIterator* pIRaspiCameraDeviceIterator = dynamic_cast<IRaspiCameraDeviceIterator*>(pIBaseClass);
+		if (!pIRaspiCameraDeviceIterator)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		pBaseCurrentInstance = pIRaspiCameraDeviceIterator->GetCameraDevice();
+
+		*pCurrentInstance = (IBase*)(pBaseCurrentInstance);
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for Driver_RaspiCamera
+**************************************************************************************************************************/
+LibMCDriver_CameraResult libmcdriver_camera_driver_raspicamera_querydevices(LibMCDriver_Camera_Driver_RaspiCamera pDriver_RaspiCamera, LibMCDriver_Camera_RaspiCameraDeviceIterator * pDeviceIterator)
+{
+	IBase* pIBaseClass = (IBase *)pDriver_RaspiCamera;
+
+	try {
+		if (pDeviceIterator == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		IBase* pBaseDeviceIterator(nullptr);
+		IDriver_RaspiCamera* pIDriver_RaspiCamera = dynamic_cast<IDriver_RaspiCamera*>(pIBaseClass);
+		if (!pIDriver_RaspiCamera)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		pBaseDeviceIterator = pIDriver_RaspiCamera->QueryDevices();
+
+		*pDeviceIterator = (IBase*)(pBaseDeviceIterator);
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_driver_raspicamera_initialize(LibMCDriver_Camera_Driver_RaspiCamera pDriver_RaspiCamera, const char * pDeviceString, LibMCDriver_Camera_uint32 nWidth, LibMCDriver_Camera_uint32 nHeight, eLibMCDriver_CameraImagePixelFormat ePixelformat)
+{
+	IBase* pIBaseClass = (IBase *)pDriver_RaspiCamera;
+
+	try {
+		if (pDeviceString == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		std::string sDeviceString(pDeviceString);
+		IDriver_RaspiCamera* pIDriver_RaspiCamera = dynamic_cast<IDriver_RaspiCamera*>(pIBaseClass);
+		if (!pIDriver_RaspiCamera)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		pIDriver_RaspiCamera->Initialize(sDeviceString, nWidth, nHeight, ePixelformat);
+
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+
+/*************************************************************************************************************************
+ Function table lookup implementation
+**************************************************************************************************************************/
+
+LibMCDriver_CameraResult LibMCDriver_Camera::Impl::LibMCDriver_Camera_GetProcAddress (const char * pProcName, void ** ppProcAddress)
+{
+	if (pProcName == nullptr)
+		return LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM;
+	if (ppProcAddress == nullptr)
+		return LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM;
+	*ppProcAddress = nullptr;
+	std::string sProcName (pProcName);
+	
+	if (sProcName == "libmcdriver_camera_driver_getname") 
+		*ppProcAddress = (void*) &libmcdriver_camera_driver_getname;
+	if (sProcName == "libmcdriver_camera_driver_gettype") 
+		*ppProcAddress = (void*) &libmcdriver_camera_driver_gettype;
+	if (sProcName == "libmcdriver_camera_driver_getversion") 
+		*ppProcAddress = (void*) &libmcdriver_camera_driver_getversion;
+	if (sProcName == "libmcdriver_camera_driver_getheaderinformation") 
+		*ppProcAddress = (void*) &libmcdriver_camera_driver_getheaderinformation;
+	if (sProcName == "libmcdriver_camera_iterator_movenext") 
+		*ppProcAddress = (void*) &libmcdriver_camera_iterator_movenext;
+	if (sProcName == "libmcdriver_camera_iterator_moveprevious") 
+		*ppProcAddress = (void*) &libmcdriver_camera_iterator_moveprevious;
+	if (sProcName == "libmcdriver_camera_iterator_getcurrent") 
+		*ppProcAddress = (void*) &libmcdriver_camera_iterator_getcurrent;
+	if (sProcName == "libmcdriver_camera_iterator_clone") 
+		*ppProcAddress = (void*) &libmcdriver_camera_iterator_clone;
+	if (sProcName == "libmcdriver_camera_iterator_count") 
+		*ppProcAddress = (void*) &libmcdriver_camera_iterator_count;
+	if (sProcName == "libmcdriver_camera_pngimage_getwidth") 
+		*ppProcAddress = (void*) &libmcdriver_camera_pngimage_getwidth;
+	if (sProcName == "libmcdriver_camera_pngimage_getheight") 
+		*ppProcAddress = (void*) &libmcdriver_camera_pngimage_getheight;
+	if (sProcName == "libmcdriver_camera_pngimage_getpixelformat") 
+		*ppProcAddress = (void*) &libmcdriver_camera_pngimage_getpixelformat;
+	if (sProcName == "libmcdriver_camera_pngimage_getrawdata") 
+		*ppProcAddress = (void*) &libmcdriver_camera_pngimage_getrawdata;
+	if (sProcName == "libmcdriver_camera_pngimage_savetofile") 
+		*ppProcAddress = (void*) &libmcdriver_camera_pngimage_savetofile;
+	if (sProcName == "libmcdriver_camera_driver_camera_capturepngimage") 
+		*ppProcAddress = (void*) &libmcdriver_camera_driver_camera_capturepngimage;
+	if (sProcName == "libmcdriver_camera_raspicameradevice_getdevicestring") 
+		*ppProcAddress = (void*) &libmcdriver_camera_raspicameradevice_getdevicestring;
+	if (sProcName == "libmcdriver_camera_raspicameradeviceiterator_getcameradevice") 
+		*ppProcAddress = (void*) &libmcdriver_camera_raspicameradeviceiterator_getcameradevice;
+	if (sProcName == "libmcdriver_camera_driver_raspicamera_querydevices") 
+		*ppProcAddress = (void*) &libmcdriver_camera_driver_raspicamera_querydevices;
+	if (sProcName == "libmcdriver_camera_driver_raspicamera_initialize") 
+		*ppProcAddress = (void*) &libmcdriver_camera_driver_raspicamera_initialize;
+	if (sProcName == "libmcdriver_camera_getversion") 
+		*ppProcAddress = (void*) &libmcdriver_camera_getversion;
+	if (sProcName == "libmcdriver_camera_getlasterror") 
+		*ppProcAddress = (void*) &libmcdriver_camera_getlasterror;
+	if (sProcName == "libmcdriver_camera_releaseinstance") 
+		*ppProcAddress = (void*) &libmcdriver_camera_releaseinstance;
+	if (sProcName == "libmcdriver_camera_acquireinstance") 
+		*ppProcAddress = (void*) &libmcdriver_camera_acquireinstance;
+	if (sProcName == "libmcdriver_camera_injectcomponent") 
+		*ppProcAddress = (void*) &libmcdriver_camera_injectcomponent;
+	if (sProcName == "libmcdriver_camera_getsymbollookupmethod") 
+		*ppProcAddress = (void*) &libmcdriver_camera_getsymbollookupmethod;
+	if (sProcName == "libmcdriver_camera_createdriver") 
+		*ppProcAddress = (void*) &libmcdriver_camera_createdriver;
+	
+	if (*ppProcAddress == nullptr) 
+		return LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	return LIBMCDRIVER_CAMERA_SUCCESS;
+}
+
+/*************************************************************************************************************************
+ Global functions implementation
+**************************************************************************************************************************/
+LibMCDriver_CameraResult libmcdriver_camera_getversion(LibMCDriver_Camera_uint32 * pMajor, LibMCDriver_Camera_uint32 * pMinor, LibMCDriver_Camera_uint32 * pMicro)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		if (!pMajor)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		if (!pMinor)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		if (!pMicro)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		CWrapper::GetVersion(*pMajor, *pMinor, *pMicro);
+
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_getlasterror(LibMCDriver_Camera_Base pInstance, const LibMCDriver_Camera_uint32 nErrorMessageBufferSize, LibMCDriver_Camera_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		if ( (!pErrorMessageBuffer) && !(pErrorMessageNeededChars) )
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		if (pHasError == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		IBase* pIBaseClassInstance = (IBase *)pInstance;
+		IBase* pIInstance = dynamic_cast<IBase*>(pIBaseClassInstance);
+		if (!pIInstance)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		std::string sErrorMessage("");
+		*pHasError = CWrapper::GetLastError(pIInstance, sErrorMessage);
+
+		if (pErrorMessageNeededChars)
+			*pErrorMessageNeededChars = (LibMCDriver_Camera_uint32) (sErrorMessage.size()+1);
+		if (pErrorMessageBuffer) {
+			if (sErrorMessage.size() >= nErrorMessageBufferSize)
+				throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_BUFFERTOOSMALL);
+			for (size_t iErrorMessage = 0; iErrorMessage < sErrorMessage.size(); iErrorMessage++)
+				pErrorMessageBuffer[iErrorMessage] = sErrorMessage[iErrorMessage];
+			pErrorMessageBuffer[sErrorMessage.size()] = 0;
+		}
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_releaseinstance(LibMCDriver_Camera_Base pInstance)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		IBase* pIBaseClassInstance = (IBase *)pInstance;
+		IBase* pIInstance = dynamic_cast<IBase*>(pIBaseClassInstance);
+		if (!pIInstance)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		CWrapper::ReleaseInstance(pIInstance);
+
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_acquireinstance(LibMCDriver_Camera_Base pInstance)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		IBase* pIBaseClassInstance = (IBase *)pInstance;
+		IBase* pIInstance = dynamic_cast<IBase*>(pIBaseClassInstance);
+		if (!pIInstance)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		CWrapper::AcquireInstance(pIInstance);
+
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_injectcomponent(const char * pNameSpace, LibMCDriver_Camera_pvoid pSymbolAddressMethod)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		if (pNameSpace == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		std::string sNameSpace(pNameSpace);
+		
+		bool bNameSpaceFound = false;
+		
+		if (sNameSpace == "LibMCDriverEnv") {
+			if (CWrapper::sPLibMCDriverEnvWrapper.get() != nullptr) {
+				throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_COULDNOTLOADLIBRARY);
+			}
+			CWrapper::sPLibMCDriverEnvWrapper = LibMCDriverEnv::CWrapper::loadLibraryFromSymbolLookupMethod(pSymbolAddressMethod);
+			bNameSpaceFound = true;
+		}
+		
+		if (!bNameSpaceFound)
+			throw ELibMCDriver_CameraInterfaceException(LIBMCDRIVER_CAMERA_ERROR_COULDNOTLOADLIBRARY);
+		
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_getsymbollookupmethod(LibMCDriver_Camera_pvoid * pSymbolLookupMethod)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		if (pSymbolLookupMethod == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		*pSymbolLookupMethod = (void*)&LibMCDriver_Camera::Impl::LibMCDriver_Camera_GetProcAddress;
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_CameraResult libmcdriver_camera_createdriver(const char * pName, const char * pType, LibMCDriverEnv_DriverEnvironment pDriverEnvironment, LibMCDriver_Camera_Driver * pInstance)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		if (pName == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		if (pType == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		if (pInstance == nullptr)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM);
+		std::string sName(pName);
+		std::string sType(pType);
+		LibMCDriverEnv::PDriverEnvironment pIDriverEnvironment = std::make_shared<LibMCDriverEnv::CDriverEnvironment>(CWrapper::sPLibMCDriverEnvWrapper.get(), pDriverEnvironment);
+		CWrapper::sPLibMCDriverEnvWrapper->AcquireInstance(pIDriverEnvironment.get());
+		if (!pIDriverEnvironment)
+			throw ELibMCDriver_CameraInterfaceException (LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST);
+		
+		IBase* pBaseInstance(nullptr);
+		pBaseInstance = CWrapper::CreateDriver(sName, sType, pIDriverEnvironment);
+
+		*pInstance = (IBase*)(pBaseInstance);
+		return LIBMCDRIVER_CAMERA_SUCCESS;
+	}
+	catch (ELibMCDriver_CameraInterfaceException & Exception) {
+		return handleLibMCDriver_CameraException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
diff --git a/Drivers/Camera/Interfaces/libmcdriver_camera_types.hpp b/Drivers/Camera/Interfaces/libmcdriver_camera_types.hpp
new file mode 100644
index 00000000..7897cf0a
--- /dev/null
+++ b/Drivers/Camera/Interfaces/libmcdriver_camera_types.hpp
@@ -0,0 +1,163 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file with basic types in
+order to allow an easy use of MC Driver Camera
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDRIVER_CAMERA_TYPES_HEADER_CPP
+#define __LIBMCDRIVER_CAMERA_TYPES_HEADER_CPP
+
+
+/*************************************************************************************************************************
+ Scalar types definition
+**************************************************************************************************************************/
+
+#ifdef LIBMCDRIVER_CAMERA_USELEGACYINTEGERTYPES
+
+typedef unsigned char LibMCDriver_Camera_uint8;
+typedef unsigned short LibMCDriver_Camera_uint16 ;
+typedef unsigned int LibMCDriver_Camera_uint32;
+typedef unsigned long long LibMCDriver_Camera_uint64;
+typedef char LibMCDriver_Camera_int8;
+typedef short LibMCDriver_Camera_int16;
+typedef int LibMCDriver_Camera_int32;
+typedef long long LibMCDriver_Camera_int64;
+
+#else // LIBMCDRIVER_CAMERA_USELEGACYINTEGERTYPES
+
+#include <stdint.h>
+
+typedef uint8_t LibMCDriver_Camera_uint8;
+typedef uint16_t LibMCDriver_Camera_uint16;
+typedef uint32_t LibMCDriver_Camera_uint32;
+typedef uint64_t LibMCDriver_Camera_uint64;
+typedef int8_t LibMCDriver_Camera_int8;
+typedef int16_t LibMCDriver_Camera_int16;
+typedef int32_t LibMCDriver_Camera_int32;
+typedef int64_t LibMCDriver_Camera_int64 ;
+
+#endif // LIBMCDRIVER_CAMERA_USELEGACYINTEGERTYPES
+
+typedef float LibMCDriver_Camera_single;
+typedef double LibMCDriver_Camera_double;
+
+/*************************************************************************************************************************
+ General type definitions
+**************************************************************************************************************************/
+
+typedef LibMCDriver_Camera_int32 LibMCDriver_CameraResult;
+typedef void * LibMCDriver_CameraHandle;
+typedef void * LibMCDriver_Camera_pvoid;
+
+/*************************************************************************************************************************
+ Version for LibMCDriver_Camera
+**************************************************************************************************************************/
+
+#define LIBMCDRIVER_CAMERA_VERSION_MAJOR 1
+#define LIBMCDRIVER_CAMERA_VERSION_MINOR 0
+#define LIBMCDRIVER_CAMERA_VERSION_MICRO 0
+#define LIBMCDRIVER_CAMERA_VERSION_PRERELEASEINFO ""
+#define LIBMCDRIVER_CAMERA_VERSION_BUILDINFO ""
+
+/*************************************************************************************************************************
+ Error constants for LibMCDriver_Camera
+**************************************************************************************************************************/
+
+#define LIBMCDRIVER_CAMERA_SUCCESS 0
+#define LIBMCDRIVER_CAMERA_ERROR_NOTIMPLEMENTED 1
+#define LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM 2
+#define LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST 3
+#define LIBMCDRIVER_CAMERA_ERROR_BUFFERTOOSMALL 4
+#define LIBMCDRIVER_CAMERA_ERROR_GENERICEXCEPTION 5
+#define LIBMCDRIVER_CAMERA_ERROR_COULDNOTLOADLIBRARY 6
+#define LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT 7
+#define LIBMCDRIVER_CAMERA_ERROR_INCOMPATIBLEBINARYVERSION 8
+#define LIBMCDRIVER_CAMERA_ERROR_INVALIDSTATENAME 9
+#define LIBMCDRIVER_CAMERA_ERROR_DRIVERERROR 1000
+#define LIBMCDRIVER_CAMERA_ERROR_ITERATORERROR 1001
+
+/*************************************************************************************************************************
+ Error strings for LibMCDriver_Camera
+**************************************************************************************************************************/
+
+inline const char * LIBMCDRIVER_CAMERA_GETERRORSTRING (LibMCDriver_CameraResult nErrorCode) {
+  switch (nErrorCode) {
+    case LIBMCDRIVER_CAMERA_SUCCESS: return "no error";
+    case LIBMCDRIVER_CAMERA_ERROR_NOTIMPLEMENTED: return "functionality not implemented";
+    case LIBMCDRIVER_CAMERA_ERROR_INVALIDPARAM: return "an invalid parameter was passed";
+    case LIBMCDRIVER_CAMERA_ERROR_INVALIDCAST: return "a type cast failed";
+    case LIBMCDRIVER_CAMERA_ERROR_BUFFERTOOSMALL: return "a provided buffer is too small";
+    case LIBMCDRIVER_CAMERA_ERROR_GENERICEXCEPTION: return "a generic exception occurred";
+    case LIBMCDRIVER_CAMERA_ERROR_COULDNOTLOADLIBRARY: return "the library could not be loaded";
+    case LIBMCDRIVER_CAMERA_ERROR_COULDNOTFINDLIBRARYEXPORT: return "a required exported symbol could not be found in the library";
+    case LIBMCDRIVER_CAMERA_ERROR_INCOMPATIBLEBINARYVERSION: return "the version of the binary interface does not match the bindings interface";
+    case LIBMCDRIVER_CAMERA_ERROR_INVALIDSTATENAME: return "invalid state name";
+    case LIBMCDRIVER_CAMERA_ERROR_DRIVERERROR: return "a driver error occured";
+    case LIBMCDRIVER_CAMERA_ERROR_ITERATORERROR: return "iterator does not point at valid object.";
+    default: return "unknown error";
+  }
+}
+
+/*************************************************************************************************************************
+ Declaration of handle classes 
+**************************************************************************************************************************/
+
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_Base;
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_Driver;
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_Iterator;
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_PNGImage;
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_Driver_Camera;
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_RaspiCameraDevice;
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_RaspiCameraDeviceIterator;
+typedef LibMCDriver_CameraHandle LibMCDriver_Camera_Driver_RaspiCamera;
+
+namespace LibMCDriver_Camera {
+
+  /*************************************************************************************************************************
+   Declaration of enums
+  **************************************************************************************************************************/
+  
+  enum class eImagePixelFormat : LibMCDriver_Camera_int32 {
+    Unknown = 0,
+    RGB32 = 1,
+    Grayscale32 = 2
+  };
+  
+} // namespace LibMCDriver_Camera;
+
+// define legacy C-names for enums, structs and function types
+typedef LibMCDriver_Camera::eImagePixelFormat eLibMCDriver_CameraImagePixelFormat;
+
+#endif // __LIBMCDRIVER_CAMERA_TYPES_HEADER_CPP
diff --git a/Drivers/Camera/Interfaces/libmcdriver_interfacewrapper.cpp b/Drivers/Camera/Interfaces/libmcdriver_interfacewrapper.cpp
new file mode 100644
index 00000000..602d8170
--- /dev/null
+++ b/Drivers/Camera/Interfaces/libmcdriver_interfacewrapper.cpp
@@ -0,0 +1,89 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#include "libmcdriver_abi.hpp"
+#include "libmcdriver_camera_abi.hpp"
+
+LIBMCDRIVER_DECLSPEC LibMCDriverResult libmcdriver_driver_getname(LibMCDriver_Driver pDriver, const LibMCDriver_uint32 nNameBufferSize, LibMCDriver_uint32* pNameNeededChars, char * pNameBuffer)
+{
+	return libmcdriver_camera_driver_getname (pDriver, nNameBufferSize, pNameNeededChars, pNameBuffer);
+}
+
+LIBMCDRIVER_DECLSPEC LibMCDriverResult libmcdriver_driver_gettype(LibMCDriver_Driver pDriver, const LibMCDriver_uint32 nTypeBufferSize, LibMCDriver_uint32* pTypeNeededChars, char * pTypeBuffer)
+{
+	return libmcdriver_camera_driver_gettype(pDriver, nTypeBufferSize, pTypeNeededChars, pTypeBuffer);
+}
+
+LIBMCDRIVER_DECLSPEC LibMCDriverResult libmcdriver_driver_getversion(LibMCDriver_Driver pDriver, LibMCDriver_uint32 * pMajor, LibMCDriver_uint32 * pMinor, LibMCDriver_uint32 * pMicro, const LibMCDriver_uint32 nBuildBufferSize, LibMCDriver_uint32* pBuildNeededChars, char * pBuildBuffer)
+{
+	return libmcdriver_camera_driver_getversion(pDriver, pMajor, pMinor, pMicro, nBuildBufferSize, pBuildNeededChars, pBuildBuffer);
+}
+
+LIBMCDRIVER_DECLSPEC LibMCDriverResult libmcdriver_driver_getheaderinformation(LibMCDriver_Driver pDriver, const LibMCDriver_uint32 nNameSpaceBufferSize, LibMCDriver_uint32* pNameSpaceNeededChars, char * pNameSpaceBuffer, const LibMCDriver_uint32 nBaseNameBufferSize, LibMCDriver_uint32* pBaseNameNeededChars, char * pBaseNameBuffer)
+{
+	return libmcdriver_camera_driver_getheaderinformation(pDriver, nNameSpaceBufferSize, pNameSpaceNeededChars, pNameSpaceBuffer, nNameSpaceBufferSize, pBaseNameNeededChars, pBaseNameBuffer);
+}
+
+LIBMCDRIVER_DECLSPEC LibMCDriverResult libmcdriver_getversion(LibMCDriver_uint32 * pMajor, LibMCDriver_uint32 * pMinor, LibMCDriver_uint32 * pMicro)
+{
+	return libmcdriver_camera_getversion(pMajor, pMinor, pMicro);
+}
+
+LIBMCDRIVER_DECLSPEC LibMCDriverResult libmcdriver_getlasterror(LibMCDriver_Base pInstance, const LibMCDriver_uint32 nErrorMessageBufferSize, LibMCDriver_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError)
+{
+	return libmcdriver_camera_getlasterror(pInstance, nErrorMessageBufferSize, pErrorMessageNeededChars, pErrorMessageBuffer, pHasError);
+}
+
+LIBMCDRIVER_DECLSPEC LibMCDriverResult libmcdriver_releaseinstance(LibMCDriver_Base pInstance)
+{
+	return libmcdriver_camera_releaseinstance(pInstance);
+}
+
+LIBMCDRIVER_DECLSPEC LibMCDriverResult libmcdriver_acquireinstance(LibMCDriver_Base pInstance)
+{
+	return libmcdriver_camera_acquireinstance(pInstance);
+}
+
+
+LIBMCDRIVER_DECLSPEC LibMCDriverResult libmcdriver_injectcomponent(const char * pNameSpace, LibMCDriver_pvoid pSymbolAddressMethod)
+{
+	return libmcdriver_camera_injectcomponent(pNameSpace, pSymbolAddressMethod);
+}
+
+LIBMCDRIVER_DECLSPEC LibMCDriverResult libmcdriver_createdriver(const char * pName, const char * pType, LibMCDriverEnv_DriverEnvironment pDriverEnvironment, LibMCDriver_Driver * pInstance)
+{
+	return libmcdriver_camera_createdriver(pName, pType, pDriverEnvironment, pInstance);
+}
+
+LIBMCDRIVER_DECLSPEC LibMCDriverResult libmcdriver_getsymbollookupmethod(LibMCDriver_pvoid* pSymbolLookupMethod)
+{
+	return libmcdriver_camera_getsymbollookupmethod(pSymbolLookupMethod);
+}
diff --git a/Drivers/Marlin/ACT/LibMCDriver_Marlin.xml b/Drivers/Marlin/ACT/LibMCDriver_Marlin.xml
index e20b700b..dbaa5391 100644
--- a/Drivers/Marlin/ACT/LibMCDriver_Marlin.xml
+++ b/Drivers/Marlin/ACT/LibMCDriver_Marlin.xml
@@ -108,6 +108,8 @@ Custom implementation
 		<method name="Connect" description="Creates and initializes a new Marlin Connector.">
 			<param name="COMPort" type="string" pass="in" description="Device Port to connect to" />
 			<param name="Baudrate" type="uint32" pass="in" description="Baudrate to use" />
+			<param name="StatusUpdateInterval" type="double" pass="in" description="Timer interval [ms] for updating status" />
+			<param name="ConnectTimeout" type="uint32" pass="in" description="Timeout [ms] for connecting printer" />
 		</method>
 
 		<method name="Disconnect" description="Disconnects from the Marlin board.">
@@ -117,6 +119,28 @@ Custom implementation
 			<param name="Absolute" type="bool" pass="in" description="If true, sets positioning to absolute, if false to relative" />
 		</method>
 		
+		<method name="SetHeatedBedTargetTemperature" description="Sets heated bed target temperature.">
+			<param name="TemperatureInDegreeCelcius" type="double" pass="in" description="Bed target temperature." />
+			<param name="WaitForTemp" type="bool" pass="in" description="If true, waits for the target bed temperature to be reached before proceeding" />
+		</method>
+
+		<method name="SetExtruderTargetTemperature" description="Sets target temperature of the given extruder.">
+			<param name="ExtruderID" type="uint32" pass="in" description="ID of extruder." />
+			<param name="TemperatureInDegreeCelcius" type="double" pass="in" description="Extruder target temperature." />
+			<param name="WaitForTemp" type="bool" pass="in" description="If true, waits for the target extruder temperature to be reached before proceeding" />
+		</method>
+
+		<method name="SetFanSpeed" description="Turns on one of the fans and set its speed.">
+			<param name="FanID" type="uint32" pass="in" description="ID of fan." />
+			<param name="Speed" type="uint32" pass="in" description="Fan speed [0..255]. 0=0%...255=100%" />
+		</method>
+
+		<method name="SetPidParameters" description="Sets PID parameters.">
+			<param name="P" type="double" pass="in" description="New value for P parameter." />
+			<param name="I" type="double" pass="in" description="New value for I parameter." />
+			<param name="D" type="double" pass="in" description="New value for D parameter." />
+		</method>
+
 		<method name="UpdateState" description="Polls a new state from the firmware.">
 		</method>
 
@@ -132,10 +156,25 @@ Custom implementation
 			<param name="Z" type="double" pass="out" description="Z Value in mm" />
 		</method>
 
-		<method name="GetExtruderTemperature" description="Returns the current temperature of an extruder.">
-			<param name="ExtruderID" type="uint32" pass="in" description="ID of Extruder" />
+		<method name="GetExtruderTargetPosition" description="Returns the target extruder position.">
+			<param name="E" type="double" pass="out" description="E Value in mm" />
+		</method>
+
+		<method name="GetHeatedBedTemperature" description="Returns the current and the target bed temperature.">
+			<param name="TargetTemperature" type="double" pass="out" description="Target Temperature in degree celsius." />
 			<param name="CurrentTemperature" type="double" pass="out" description="Current Temperature in degree celsius." />
+		</method>
+
+		<method name="GetExtruderTemperature" description="Returns the current and the target temperature of an extruder.">
+			<param name="ExtruderID" type="uint32" pass="in" description="ID of Extruder" />
 			<param name="TargetTemperature" type="double" pass="out" description="Target Temperature in degree celsius." />
+			<param name="CurrentTemperature" type="double" pass="out" description="Current Temperature in degree celsius." />
+		</method>
+
+		<method name="GetPidParameters" description="Returns the current PID values.">
+			<param name="P" type="double" pass="out" description="Current P value." />
+			<param name="I" type="double" pass="out" description="Current I value." />
+			<param name="D" type="double" pass="out" description="Current D value." />
 		</method>
 
 
@@ -147,21 +186,37 @@ Custom implementation
 			<param name="Value" type="bool" pass="return" description="Extruder is moving" />
 		</method>
 
-		<method name="MoveTo" description="Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.">
+		<method name="IsHomed" description="Returns if the printer is homed">
+			<param name="Value" type="bool" pass="return" description="True if printer is homed." />
+		</method>
+
+		<method name="MoveToXY" description="Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.">
 			<param name="X" type="double" pass="in" description="X Value in mm" />
 			<param name="Y" type="double" pass="in" description="Y Value in mm" />
-			<param name="Z" type="double" pass="in" description="Z Value in mm" />
+			<param name="E" type="double" pass="in" description="E Value in mm" />
 			<param name="Speed" type="double" pass="in" description="Movement speed in mm/s" />
 		</method>
 
-		<method name="MoveFastTo" description="Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.">
+		<method name="MoveFastToXY" description="Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.">
 			<param name="X" type="double" pass="in" description="X Value in mm" />
 			<param name="Y" type="double" pass="in" description="Y Value in mm" />
-			<param name="Z" type="double" pass="in" description="Z Value in mm" />
 			<param name="Speed" type="double" pass="in" description="Movement speed in mm/s" />
 		</method>
 		
+		<method name="MoveToZ" description="Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.">
+			<param name="Z" type="double" pass="in" description="Z Value in mm" />
+			<param name="E" type="double" pass="in" description="E Value in mm" />
+			<param name="Speed" type="double" pass="in" description="Movement speed in mm/s" />
+		</method>
+
+		<method name="MoveFastToZ" description="Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.">
+			<param name="Z" type="double" pass="in" description="Z Value in mm" />
+			<param name="Speed" type="double" pass="in" description="Movement speed in mm/s" />
+		</method>
 	
+		<method name="StartHoming" description="Start Homing of printer.">
+		</method>
+
 	</class>
 
 
diff --git a/Drivers/Marlin/Headers/CppDynamic/libmcdriver_marlin_abi.hpp b/Drivers/Marlin/Headers/CppDynamic/libmcdriver_marlin_abi.hpp
index 4a922d34..c008d1ce 100644
--- a/Drivers/Marlin/Headers/CppDynamic/libmcdriver_marlin_abi.hpp
+++ b/Drivers/Marlin/Headers/CppDynamic/libmcdriver_marlin_abi.hpp
@@ -125,9 +125,11 @@ LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_g
 * @param[in] pDriver_Marlin - Driver_Marlin instance.
 * @param[in] pCOMPort - Device Port to connect to
 * @param[in] nBaudrate - Baudrate to use
+* @param[in] dStatusUpdateInterval - Timer interval [ms] for updating status
+* @param[in] nConnectTimeout - Timeout [ms] for connecting printer
 * @return error code or 0 (success)
 */
-LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_connect(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, const char * pCOMPort, LibMCDriver_Marlin_uint32 nBaudrate);
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_connect(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, const char * pCOMPort, LibMCDriver_Marlin_uint32 nBaudrate, LibMCDriver_Marlin_double dStatusUpdateInterval, LibMCDriver_Marlin_uint32 nConnectTimeout);
 
 /**
 * Disconnects from the Marlin board.
@@ -146,6 +148,48 @@ LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_m
 */
 LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setabsolutepositioning(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, bool bAbsolute);
 
+/**
+* Sets heated bed target temperature.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] dTemperatureInDegreeCelcius - Bed target temperature.
+* @param[in] bWaitForTemp - If true, waits for the target bed temperature to be reached before proceeding
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setheatedbedtargettemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, bool bWaitForTemp);
+
+/**
+* Sets target temperature of the given extruder.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] nExtruderID - ID of extruder.
+* @param[in] dTemperatureInDegreeCelcius - Extruder target temperature.
+* @param[in] bWaitForTemp - If true, waits for the target extruder temperature to be reached before proceeding
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setextrudertargettemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, bool bWaitForTemp);
+
+/**
+* Turns on one of the fans and set its speed.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] nFanID - ID of fan.
+* @param[in] nSpeed - Fan speed [0..255]. 0=0%!.(MISSING).255=100%!
+(MISSING)* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setfanspeed(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nFanID, LibMCDriver_Marlin_uint32 nSpeed);
+
+/**
+* Sets PID parameters.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] dP - New value for P parameter.
+* @param[in] dI - New value for I parameter.
+* @param[in] dD - New value for D parameter.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setpidparameters(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dP, LibMCDriver_Marlin_double dI, LibMCDriver_Marlin_double dD);
+
 /**
 * Polls a new state from the firmware.
 *
@@ -177,15 +221,45 @@ LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_m
 LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_gettargetposition(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pX, LibMCDriver_Marlin_double * pY, LibMCDriver_Marlin_double * pZ);
 
 /**
-* Returns the current temperature of an extruder.
+* Returns the target extruder position.
 *
 * @param[in] pDriver_Marlin - Driver_Marlin instance.
-* @param[in] nExtruderID - ID of Extruder
+* @param[out] pE - E Value in mm
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getextrudertargetposition(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pE);
+
+/**
+* Returns the current and the target bed temperature.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[out] pTargetTemperature - Target Temperature in degree celsius.
 * @param[out] pCurrentTemperature - Current Temperature in degree celsius.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getheatedbedtemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pTargetTemperature, LibMCDriver_Marlin_double * pCurrentTemperature);
+
+/**
+* Returns the current and the target temperature of an extruder.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] nExtruderID - ID of Extruder
 * @param[out] pTargetTemperature - Target Temperature in degree celsius.
+* @param[out] pCurrentTemperature - Current Temperature in degree celsius.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getextrudertemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double * pTargetTemperature, LibMCDriver_Marlin_double * pCurrentTemperature);
+
+/**
+* Returns the current PID values.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[out] pP - Current P value.
+* @param[out] pI - Current I value.
+* @param[out] pD - Current D value.
 * @return error code or 0 (success)
 */
-LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getextrudertemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double * pCurrentTemperature, LibMCDriver_Marlin_double * pTargetTemperature);
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getpidparameters(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pP, LibMCDriver_Marlin_double * pI, LibMCDriver_Marlin_double * pD);
 
 /**
 * Returns if the movement buffer can receive another movement command..
@@ -205,17 +279,26 @@ LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_m
 */
 LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_ismoving(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, bool * pValue);
 
+/**
+* Returns if the printer is homed
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[out] pValue - True if printer is homed.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_ishomed(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, bool * pValue);
+
 /**
 * Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
 *
 * @param[in] pDriver_Marlin - Driver_Marlin instance.
 * @param[in] dX - X Value in mm
 * @param[in] dY - Y Value in mm
-* @param[in] dZ - Z Value in mm
+* @param[in] dE - E Value in mm
 * @param[in] dSpeed - Movement speed in mm/s
 * @return error code or 0 (success)
 */
-LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_moveto(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dSpeed);
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movetoxy(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dE, LibMCDriver_Marlin_double dSpeed);
 
 /**
 * Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
@@ -223,11 +306,39 @@ LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_m
 * @param[in] pDriver_Marlin - Driver_Marlin instance.
 * @param[in] dX - X Value in mm
 * @param[in] dY - Y Value in mm
+* @param[in] dSpeed - Movement speed in mm/s
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movefasttoxy(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dSpeed);
+
+/**
+* Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] dZ - Z Value in mm
+* @param[in] dE - E Value in mm
+* @param[in] dSpeed - Movement speed in mm/s
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movetoz(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dE, LibMCDriver_Marlin_double dSpeed);
+
+/**
+* Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
 * @param[in] dZ - Z Value in mm
 * @param[in] dSpeed - Movement speed in mm/s
 * @return error code or 0 (success)
 */
-LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movefastto(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dSpeed);
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movefasttoz(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dSpeed);
+
+/**
+* Start Homing of printer.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_starthoming(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin);
 
 /*************************************************************************************************************************
  Global functions
diff --git a/Drivers/Marlin/Headers/CppDynamic/libmcdriver_marlin_dynamic.h b/Drivers/Marlin/Headers/CppDynamic/libmcdriver_marlin_dynamic.h
index 12fccd97..a4094385 100644
--- a/Drivers/Marlin/Headers/CppDynamic/libmcdriver_marlin_dynamic.h
+++ b/Drivers/Marlin/Headers/CppDynamic/libmcdriver_marlin_dynamic.h
@@ -112,9 +112,11 @@ typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_GetHeaderInformatio
 * @param[in] pDriver_Marlin - Driver_Marlin instance.
 * @param[in] pCOMPort - Device Port to connect to
 * @param[in] nBaudrate - Baudrate to use
+* @param[in] dStatusUpdateInterval - Timer interval [ms] for updating status
+* @param[in] nConnectTimeout - Timeout [ms] for connecting printer
 * @return error code or 0 (success)
 */
-typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_ConnectPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, const char * pCOMPort, LibMCDriver_Marlin_uint32 nBaudrate);
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_ConnectPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, const char * pCOMPort, LibMCDriver_Marlin_uint32 nBaudrate, LibMCDriver_Marlin_double dStatusUpdateInterval, LibMCDriver_Marlin_uint32 nConnectTimeout);
 
 /**
 * Disconnects from the Marlin board.
@@ -133,6 +135,48 @@ typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_DisconnectPt
 */
 typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_SetAbsolutePositioningPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, bool bAbsolute);
 
+/**
+* Sets heated bed target temperature.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] dTemperatureInDegreeCelcius - Bed target temperature.
+* @param[in] bWaitForTemp - If true, waits for the target bed temperature to be reached before proceeding
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_SetHeatedBedTargetTemperaturePtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, bool bWaitForTemp);
+
+/**
+* Sets target temperature of the given extruder.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] nExtruderID - ID of extruder.
+* @param[in] dTemperatureInDegreeCelcius - Extruder target temperature.
+* @param[in] bWaitForTemp - If true, waits for the target extruder temperature to be reached before proceeding
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_SetExtruderTargetTemperaturePtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, bool bWaitForTemp);
+
+/**
+* Turns on one of the fans and set its speed.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] nFanID - ID of fan.
+* @param[in] nSpeed - Fan speed [0..255]. 0=0%!.(MISSING).255=100%!
+(MISSING)* @return error code or 0 (success)
+*/
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_SetFanSpeedPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nFanID, LibMCDriver_Marlin_uint32 nSpeed);
+
+/**
+* Sets PID parameters.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] dP - New value for P parameter.
+* @param[in] dI - New value for I parameter.
+* @param[in] dD - New value for D parameter.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_SetPidParametersPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dP, LibMCDriver_Marlin_double dI, LibMCDriver_Marlin_double dD);
+
 /**
 * Polls a new state from the firmware.
 *
@@ -164,15 +208,45 @@ typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_GetCurrentPo
 typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_GetTargetPositionPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pX, LibMCDriver_Marlin_double * pY, LibMCDriver_Marlin_double * pZ);
 
 /**
-* Returns the current temperature of an extruder.
+* Returns the target extruder position.
 *
 * @param[in] pDriver_Marlin - Driver_Marlin instance.
-* @param[in] nExtruderID - ID of Extruder
+* @param[out] pE - E Value in mm
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_GetExtruderTargetPositionPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pE);
+
+/**
+* Returns the current and the target bed temperature.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[out] pTargetTemperature - Target Temperature in degree celsius.
 * @param[out] pCurrentTemperature - Current Temperature in degree celsius.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_GetHeatedBedTemperaturePtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pTargetTemperature, LibMCDriver_Marlin_double * pCurrentTemperature);
+
+/**
+* Returns the current and the target temperature of an extruder.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] nExtruderID - ID of Extruder
 * @param[out] pTargetTemperature - Target Temperature in degree celsius.
+* @param[out] pCurrentTemperature - Current Temperature in degree celsius.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_GetExtruderTemperaturePtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double * pTargetTemperature, LibMCDriver_Marlin_double * pCurrentTemperature);
+
+/**
+* Returns the current PID values.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[out] pP - Current P value.
+* @param[out] pI - Current I value.
+* @param[out] pD - Current D value.
 * @return error code or 0 (success)
 */
-typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_GetExtruderTemperaturePtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double * pCurrentTemperature, LibMCDriver_Marlin_double * pTargetTemperature);
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_GetPidParametersPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pP, LibMCDriver_Marlin_double * pI, LibMCDriver_Marlin_double * pD);
 
 /**
 * Returns if the movement buffer can receive another movement command..
@@ -192,17 +266,26 @@ typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_CanExecuteMo
 */
 typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_IsMovingPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, bool * pValue);
 
+/**
+* Returns if the printer is homed
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[out] pValue - True if printer is homed.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_IsHomedPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, bool * pValue);
+
 /**
 * Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
 *
 * @param[in] pDriver_Marlin - Driver_Marlin instance.
 * @param[in] dX - X Value in mm
 * @param[in] dY - Y Value in mm
-* @param[in] dZ - Z Value in mm
+* @param[in] dE - E Value in mm
 * @param[in] dSpeed - Movement speed in mm/s
 * @return error code or 0 (success)
 */
-typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_MoveToPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dSpeed);
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_MoveToXYPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dE, LibMCDriver_Marlin_double dSpeed);
 
 /**
 * Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
@@ -210,11 +293,39 @@ typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_MoveToPtr) (
 * @param[in] pDriver_Marlin - Driver_Marlin instance.
 * @param[in] dX - X Value in mm
 * @param[in] dY - Y Value in mm
+* @param[in] dSpeed - Movement speed in mm/s
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_MoveFastToXYPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dSpeed);
+
+/**
+* Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] dZ - Z Value in mm
+* @param[in] dE - E Value in mm
+* @param[in] dSpeed - Movement speed in mm/s
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_MoveToZPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dE, LibMCDriver_Marlin_double dSpeed);
+
+/**
+* Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
 * @param[in] dZ - Z Value in mm
 * @param[in] dSpeed - Movement speed in mm/s
 * @return error code or 0 (success)
 */
-typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_MoveFastToPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dSpeed);
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_MoveFastToZPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dSpeed);
+
+/**
+* Start Homing of printer.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_MarlinResult (*PLibMCDriver_MarlinDriver_Marlin_StartHomingPtr) (LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin);
 
 /*************************************************************************************************************************
  Global functions
@@ -299,14 +410,25 @@ typedef struct {
 	PLibMCDriver_MarlinDriver_Marlin_ConnectPtr m_Driver_Marlin_Connect;
 	PLibMCDriver_MarlinDriver_Marlin_DisconnectPtr m_Driver_Marlin_Disconnect;
 	PLibMCDriver_MarlinDriver_Marlin_SetAbsolutePositioningPtr m_Driver_Marlin_SetAbsolutePositioning;
+	PLibMCDriver_MarlinDriver_Marlin_SetHeatedBedTargetTemperaturePtr m_Driver_Marlin_SetHeatedBedTargetTemperature;
+	PLibMCDriver_MarlinDriver_Marlin_SetExtruderTargetTemperaturePtr m_Driver_Marlin_SetExtruderTargetTemperature;
+	PLibMCDriver_MarlinDriver_Marlin_SetFanSpeedPtr m_Driver_Marlin_SetFanSpeed;
+	PLibMCDriver_MarlinDriver_Marlin_SetPidParametersPtr m_Driver_Marlin_SetPidParameters;
 	PLibMCDriver_MarlinDriver_Marlin_UpdateStatePtr m_Driver_Marlin_UpdateState;
 	PLibMCDriver_MarlinDriver_Marlin_GetCurrentPositionPtr m_Driver_Marlin_GetCurrentPosition;
 	PLibMCDriver_MarlinDriver_Marlin_GetTargetPositionPtr m_Driver_Marlin_GetTargetPosition;
+	PLibMCDriver_MarlinDriver_Marlin_GetExtruderTargetPositionPtr m_Driver_Marlin_GetExtruderTargetPosition;
+	PLibMCDriver_MarlinDriver_Marlin_GetHeatedBedTemperaturePtr m_Driver_Marlin_GetHeatedBedTemperature;
 	PLibMCDriver_MarlinDriver_Marlin_GetExtruderTemperaturePtr m_Driver_Marlin_GetExtruderTemperature;
+	PLibMCDriver_MarlinDriver_Marlin_GetPidParametersPtr m_Driver_Marlin_GetPidParameters;
 	PLibMCDriver_MarlinDriver_Marlin_CanExecuteMovementPtr m_Driver_Marlin_CanExecuteMovement;
 	PLibMCDriver_MarlinDriver_Marlin_IsMovingPtr m_Driver_Marlin_IsMoving;
-	PLibMCDriver_MarlinDriver_Marlin_MoveToPtr m_Driver_Marlin_MoveTo;
-	PLibMCDriver_MarlinDriver_Marlin_MoveFastToPtr m_Driver_Marlin_MoveFastTo;
+	PLibMCDriver_MarlinDriver_Marlin_IsHomedPtr m_Driver_Marlin_IsHomed;
+	PLibMCDriver_MarlinDriver_Marlin_MoveToXYPtr m_Driver_Marlin_MoveToXY;
+	PLibMCDriver_MarlinDriver_Marlin_MoveFastToXYPtr m_Driver_Marlin_MoveFastToXY;
+	PLibMCDriver_MarlinDriver_Marlin_MoveToZPtr m_Driver_Marlin_MoveToZ;
+	PLibMCDriver_MarlinDriver_Marlin_MoveFastToZPtr m_Driver_Marlin_MoveFastToZ;
+	PLibMCDriver_MarlinDriver_Marlin_StartHomingPtr m_Driver_Marlin_StartHoming;
 	PLibMCDriver_MarlinGetVersionPtr m_GetVersion;
 	PLibMCDriver_MarlinGetLastErrorPtr m_GetLastError;
 	PLibMCDriver_MarlinReleaseInstancePtr m_ReleaseInstance;
diff --git a/Drivers/Marlin/Headers/CppDynamic/libmcdriver_marlin_dynamic.hpp b/Drivers/Marlin/Headers/CppDynamic/libmcdriver_marlin_dynamic.hpp
index e0005ab9..f910e228 100644
--- a/Drivers/Marlin/Headers/CppDynamic/libmcdriver_marlin_dynamic.hpp
+++ b/Drivers/Marlin/Headers/CppDynamic/libmcdriver_marlin_dynamic.hpp
@@ -360,17 +360,28 @@ class CDriver_Marlin : public CDriver {
 	{
 	}
 	
-	inline void Connect(const std::string & sCOMPort, const LibMCDriver_Marlin_uint32 nBaudrate);
+	inline void Connect(const std::string & sCOMPort, const LibMCDriver_Marlin_uint32 nBaudrate, const LibMCDriver_Marlin_double dStatusUpdateInterval, const LibMCDriver_Marlin_uint32 nConnectTimeout);
 	inline void Disconnect();
 	inline void SetAbsolutePositioning(const bool bAbsolute);
+	inline void SetHeatedBedTargetTemperature(const LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, const bool bWaitForTemp);
+	inline void SetExtruderTargetTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, const LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, const bool bWaitForTemp);
+	inline void SetFanSpeed(const LibMCDriver_Marlin_uint32 nFanID, const LibMCDriver_Marlin_uint32 nSpeed);
+	inline void SetPidParameters(const LibMCDriver_Marlin_double dP, const LibMCDriver_Marlin_double dI, const LibMCDriver_Marlin_double dD);
 	inline void UpdateState();
 	inline void GetCurrentPosition(LibMCDriver_Marlin_double & dX, LibMCDriver_Marlin_double & dY, LibMCDriver_Marlin_double & dZ);
 	inline void GetTargetPosition(LibMCDriver_Marlin_double & dX, LibMCDriver_Marlin_double & dY, LibMCDriver_Marlin_double & dZ);
-	inline void GetExtruderTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double & dCurrentTemperature, LibMCDriver_Marlin_double & dTargetTemperature);
+	inline void GetExtruderTargetPosition(LibMCDriver_Marlin_double & dE);
+	inline void GetHeatedBedTemperature(LibMCDriver_Marlin_double & dTargetTemperature, LibMCDriver_Marlin_double & dCurrentTemperature);
+	inline void GetExtruderTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double & dTargetTemperature, LibMCDriver_Marlin_double & dCurrentTemperature);
+	inline void GetPidParameters(LibMCDriver_Marlin_double & dP, LibMCDriver_Marlin_double & dI, LibMCDriver_Marlin_double & dD);
 	inline bool CanExecuteMovement();
 	inline bool IsMoving();
-	inline void MoveTo(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed);
-	inline void MoveFastTo(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed);
+	inline bool IsHomed();
+	inline void MoveToXY(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dE, const LibMCDriver_Marlin_double dSpeed);
+	inline void MoveFastToXY(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dSpeed);
+	inline void MoveToZ(const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dE, const LibMCDriver_Marlin_double dSpeed);
+	inline void MoveFastToZ(const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed);
+	inline void StartHoming();
 };
 	
 	/**
@@ -501,14 +512,25 @@ class CDriver_Marlin : public CDriver {
 		pWrapperTable->m_Driver_Marlin_Connect = nullptr;
 		pWrapperTable->m_Driver_Marlin_Disconnect = nullptr;
 		pWrapperTable->m_Driver_Marlin_SetAbsolutePositioning = nullptr;
+		pWrapperTable->m_Driver_Marlin_SetHeatedBedTargetTemperature = nullptr;
+		pWrapperTable->m_Driver_Marlin_SetExtruderTargetTemperature = nullptr;
+		pWrapperTable->m_Driver_Marlin_SetFanSpeed = nullptr;
+		pWrapperTable->m_Driver_Marlin_SetPidParameters = nullptr;
 		pWrapperTable->m_Driver_Marlin_UpdateState = nullptr;
 		pWrapperTable->m_Driver_Marlin_GetCurrentPosition = nullptr;
 		pWrapperTable->m_Driver_Marlin_GetTargetPosition = nullptr;
+		pWrapperTable->m_Driver_Marlin_GetExtruderTargetPosition = nullptr;
+		pWrapperTable->m_Driver_Marlin_GetHeatedBedTemperature = nullptr;
 		pWrapperTable->m_Driver_Marlin_GetExtruderTemperature = nullptr;
+		pWrapperTable->m_Driver_Marlin_GetPidParameters = nullptr;
 		pWrapperTable->m_Driver_Marlin_CanExecuteMovement = nullptr;
 		pWrapperTable->m_Driver_Marlin_IsMoving = nullptr;
-		pWrapperTable->m_Driver_Marlin_MoveTo = nullptr;
-		pWrapperTable->m_Driver_Marlin_MoveFastTo = nullptr;
+		pWrapperTable->m_Driver_Marlin_IsHomed = nullptr;
+		pWrapperTable->m_Driver_Marlin_MoveToXY = nullptr;
+		pWrapperTable->m_Driver_Marlin_MoveFastToXY = nullptr;
+		pWrapperTable->m_Driver_Marlin_MoveToZ = nullptr;
+		pWrapperTable->m_Driver_Marlin_MoveFastToZ = nullptr;
+		pWrapperTable->m_Driver_Marlin_StartHoming = nullptr;
 		pWrapperTable->m_GetVersion = nullptr;
 		pWrapperTable->m_GetLastError = nullptr;
 		pWrapperTable->m_ReleaseInstance = nullptr;
@@ -627,6 +649,42 @@ class CDriver_Marlin : public CDriver {
 		if (pWrapperTable->m_Driver_Marlin_SetAbsolutePositioning == nullptr)
 			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_Marlin_SetHeatedBedTargetTemperature = (PLibMCDriver_MarlinDriver_Marlin_SetHeatedBedTargetTemperaturePtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_setheatedbedtargettemperature");
+		#else // _WIN32
+		pWrapperTable->m_Driver_Marlin_SetHeatedBedTargetTemperature = (PLibMCDriver_MarlinDriver_Marlin_SetHeatedBedTargetTemperaturePtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_setheatedbedtargettemperature");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_Marlin_SetHeatedBedTargetTemperature == nullptr)
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_Marlin_SetExtruderTargetTemperature = (PLibMCDriver_MarlinDriver_Marlin_SetExtruderTargetTemperaturePtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_setextrudertargettemperature");
+		#else // _WIN32
+		pWrapperTable->m_Driver_Marlin_SetExtruderTargetTemperature = (PLibMCDriver_MarlinDriver_Marlin_SetExtruderTargetTemperaturePtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_setextrudertargettemperature");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_Marlin_SetExtruderTargetTemperature == nullptr)
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_Marlin_SetFanSpeed = (PLibMCDriver_MarlinDriver_Marlin_SetFanSpeedPtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_setfanspeed");
+		#else // _WIN32
+		pWrapperTable->m_Driver_Marlin_SetFanSpeed = (PLibMCDriver_MarlinDriver_Marlin_SetFanSpeedPtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_setfanspeed");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_Marlin_SetFanSpeed == nullptr)
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_Marlin_SetPidParameters = (PLibMCDriver_MarlinDriver_Marlin_SetPidParametersPtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_setpidparameters");
+		#else // _WIN32
+		pWrapperTable->m_Driver_Marlin_SetPidParameters = (PLibMCDriver_MarlinDriver_Marlin_SetPidParametersPtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_setpidparameters");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_Marlin_SetPidParameters == nullptr)
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_Driver_Marlin_UpdateState = (PLibMCDriver_MarlinDriver_Marlin_UpdateStatePtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_updatestate");
 		#else // _WIN32
@@ -654,6 +712,24 @@ class CDriver_Marlin : public CDriver {
 		if (pWrapperTable->m_Driver_Marlin_GetTargetPosition == nullptr)
 			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_Marlin_GetExtruderTargetPosition = (PLibMCDriver_MarlinDriver_Marlin_GetExtruderTargetPositionPtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_getextrudertargetposition");
+		#else // _WIN32
+		pWrapperTable->m_Driver_Marlin_GetExtruderTargetPosition = (PLibMCDriver_MarlinDriver_Marlin_GetExtruderTargetPositionPtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_getextrudertargetposition");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_Marlin_GetExtruderTargetPosition == nullptr)
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_Marlin_GetHeatedBedTemperature = (PLibMCDriver_MarlinDriver_Marlin_GetHeatedBedTemperaturePtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_getheatedbedtemperature");
+		#else // _WIN32
+		pWrapperTable->m_Driver_Marlin_GetHeatedBedTemperature = (PLibMCDriver_MarlinDriver_Marlin_GetHeatedBedTemperaturePtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_getheatedbedtemperature");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_Marlin_GetHeatedBedTemperature == nullptr)
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_Driver_Marlin_GetExtruderTemperature = (PLibMCDriver_MarlinDriver_Marlin_GetExtruderTemperaturePtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_getextrudertemperature");
 		#else // _WIN32
@@ -663,6 +739,15 @@ class CDriver_Marlin : public CDriver {
 		if (pWrapperTable->m_Driver_Marlin_GetExtruderTemperature == nullptr)
 			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_Marlin_GetPidParameters = (PLibMCDriver_MarlinDriver_Marlin_GetPidParametersPtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_getpidparameters");
+		#else // _WIN32
+		pWrapperTable->m_Driver_Marlin_GetPidParameters = (PLibMCDriver_MarlinDriver_Marlin_GetPidParametersPtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_getpidparameters");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_Marlin_GetPidParameters == nullptr)
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_Driver_Marlin_CanExecuteMovement = (PLibMCDriver_MarlinDriver_Marlin_CanExecuteMovementPtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_canexecutemovement");
 		#else // _WIN32
@@ -682,21 +767,57 @@ class CDriver_Marlin : public CDriver {
 			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		#ifdef _WIN32
-		pWrapperTable->m_Driver_Marlin_MoveTo = (PLibMCDriver_MarlinDriver_Marlin_MoveToPtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_moveto");
+		pWrapperTable->m_Driver_Marlin_IsHomed = (PLibMCDriver_MarlinDriver_Marlin_IsHomedPtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_ishomed");
+		#else // _WIN32
+		pWrapperTable->m_Driver_Marlin_IsHomed = (PLibMCDriver_MarlinDriver_Marlin_IsHomedPtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_ishomed");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_Marlin_IsHomed == nullptr)
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_Marlin_MoveToXY = (PLibMCDriver_MarlinDriver_Marlin_MoveToXYPtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_movetoxy");
+		#else // _WIN32
+		pWrapperTable->m_Driver_Marlin_MoveToXY = (PLibMCDriver_MarlinDriver_Marlin_MoveToXYPtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_movetoxy");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_Marlin_MoveToXY == nullptr)
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_Marlin_MoveFastToXY = (PLibMCDriver_MarlinDriver_Marlin_MoveFastToXYPtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_movefasttoxy");
+		#else // _WIN32
+		pWrapperTable->m_Driver_Marlin_MoveFastToXY = (PLibMCDriver_MarlinDriver_Marlin_MoveFastToXYPtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_movefasttoxy");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_Marlin_MoveFastToXY == nullptr)
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_Marlin_MoveToZ = (PLibMCDriver_MarlinDriver_Marlin_MoveToZPtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_movetoz");
+		#else // _WIN32
+		pWrapperTable->m_Driver_Marlin_MoveToZ = (PLibMCDriver_MarlinDriver_Marlin_MoveToZPtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_movetoz");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_Marlin_MoveToZ == nullptr)
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_Marlin_MoveFastToZ = (PLibMCDriver_MarlinDriver_Marlin_MoveFastToZPtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_movefasttoz");
 		#else // _WIN32
-		pWrapperTable->m_Driver_Marlin_MoveTo = (PLibMCDriver_MarlinDriver_Marlin_MoveToPtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_moveto");
+		pWrapperTable->m_Driver_Marlin_MoveFastToZ = (PLibMCDriver_MarlinDriver_Marlin_MoveFastToZPtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_movefasttoz");
 		dlerror();
 		#endif // _WIN32
-		if (pWrapperTable->m_Driver_Marlin_MoveTo == nullptr)
+		if (pWrapperTable->m_Driver_Marlin_MoveFastToZ == nullptr)
 			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		#ifdef _WIN32
-		pWrapperTable->m_Driver_Marlin_MoveFastTo = (PLibMCDriver_MarlinDriver_Marlin_MoveFastToPtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_movefastto");
+		pWrapperTable->m_Driver_Marlin_StartHoming = (PLibMCDriver_MarlinDriver_Marlin_StartHomingPtr) GetProcAddress(hLibrary, "libmcdriver_marlin_driver_marlin_starthoming");
 		#else // _WIN32
-		pWrapperTable->m_Driver_Marlin_MoveFastTo = (PLibMCDriver_MarlinDriver_Marlin_MoveFastToPtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_movefastto");
+		pWrapperTable->m_Driver_Marlin_StartHoming = (PLibMCDriver_MarlinDriver_Marlin_StartHomingPtr) dlsym(hLibrary, "libmcdriver_marlin_driver_marlin_starthoming");
 		dlerror();
 		#endif // _WIN32
-		if (pWrapperTable->m_Driver_Marlin_MoveFastTo == nullptr)
+		if (pWrapperTable->m_Driver_Marlin_StartHoming == nullptr)
 			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		#ifdef _WIN32
@@ -806,6 +927,22 @@ class CDriver_Marlin : public CDriver {
 		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_SetAbsolutePositioning == nullptr) )
 			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_setheatedbedtargettemperature", (void**)&(pWrapperTable->m_Driver_Marlin_SetHeatedBedTargetTemperature));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_SetHeatedBedTargetTemperature == nullptr) )
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_setextrudertargettemperature", (void**)&(pWrapperTable->m_Driver_Marlin_SetExtruderTargetTemperature));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_SetExtruderTargetTemperature == nullptr) )
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_setfanspeed", (void**)&(pWrapperTable->m_Driver_Marlin_SetFanSpeed));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_SetFanSpeed == nullptr) )
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_setpidparameters", (void**)&(pWrapperTable->m_Driver_Marlin_SetPidParameters));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_SetPidParameters == nullptr) )
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_updatestate", (void**)&(pWrapperTable->m_Driver_Marlin_UpdateState));
 		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_UpdateState == nullptr) )
 			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -818,10 +955,22 @@ class CDriver_Marlin : public CDriver {
 		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_GetTargetPosition == nullptr) )
 			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_getextrudertargetposition", (void**)&(pWrapperTable->m_Driver_Marlin_GetExtruderTargetPosition));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_GetExtruderTargetPosition == nullptr) )
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_getheatedbedtemperature", (void**)&(pWrapperTable->m_Driver_Marlin_GetHeatedBedTemperature));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_GetHeatedBedTemperature == nullptr) )
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_getextrudertemperature", (void**)&(pWrapperTable->m_Driver_Marlin_GetExtruderTemperature));
 		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_GetExtruderTemperature == nullptr) )
 			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_getpidparameters", (void**)&(pWrapperTable->m_Driver_Marlin_GetPidParameters));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_GetPidParameters == nullptr) )
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_canexecutemovement", (void**)&(pWrapperTable->m_Driver_Marlin_CanExecuteMovement));
 		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_CanExecuteMovement == nullptr) )
 			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -830,12 +979,28 @@ class CDriver_Marlin : public CDriver {
 		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_IsMoving == nullptr) )
 			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
-		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_moveto", (void**)&(pWrapperTable->m_Driver_Marlin_MoveTo));
-		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_MoveTo == nullptr) )
+		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_ishomed", (void**)&(pWrapperTable->m_Driver_Marlin_IsHomed));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_IsHomed == nullptr) )
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_movetoxy", (void**)&(pWrapperTable->m_Driver_Marlin_MoveToXY));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_MoveToXY == nullptr) )
 			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
-		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_movefastto", (void**)&(pWrapperTable->m_Driver_Marlin_MoveFastTo));
-		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_MoveFastTo == nullptr) )
+		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_movefasttoxy", (void**)&(pWrapperTable->m_Driver_Marlin_MoveFastToXY));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_MoveFastToXY == nullptr) )
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_movetoz", (void**)&(pWrapperTable->m_Driver_Marlin_MoveToZ));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_MoveToZ == nullptr) )
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_movefasttoz", (void**)&(pWrapperTable->m_Driver_Marlin_MoveFastToZ));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_MoveFastToZ == nullptr) )
+			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_marlin_driver_marlin_starthoming", (void**)&(pWrapperTable->m_Driver_Marlin_StartHoming));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_Marlin_StartHoming == nullptr) )
 			return LIBMCDRIVER_MARLIN_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		eLookupError = (*pLookup)("libmcdriver_marlin_getversion", (void**)&(pWrapperTable->m_GetVersion));
@@ -953,10 +1118,12 @@ class CDriver_Marlin : public CDriver {
 	* CDriver_Marlin::Connect - Creates and initializes a new Marlin Connector.
 	* @param[in] sCOMPort - Device Port to connect to
 	* @param[in] nBaudrate - Baudrate to use
+	* @param[in] dStatusUpdateInterval - Timer interval [ms] for updating status
+	* @param[in] nConnectTimeout - Timeout [ms] for connecting printer
 	*/
-	void CDriver_Marlin::Connect(const std::string & sCOMPort, const LibMCDriver_Marlin_uint32 nBaudrate)
+	void CDriver_Marlin::Connect(const std::string & sCOMPort, const LibMCDriver_Marlin_uint32 nBaudrate, const LibMCDriver_Marlin_double dStatusUpdateInterval, const LibMCDriver_Marlin_uint32 nConnectTimeout)
 	{
-		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_Connect(m_pHandle, sCOMPort.c_str(), nBaudrate));
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_Connect(m_pHandle, sCOMPort.c_str(), nBaudrate, dStatusUpdateInterval, nConnectTimeout));
 	}
 	
 	/**
@@ -976,6 +1143,48 @@ class CDriver_Marlin : public CDriver {
 		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_SetAbsolutePositioning(m_pHandle, bAbsolute));
 	}
 	
+	/**
+	* CDriver_Marlin::SetHeatedBedTargetTemperature - Sets heated bed target temperature.
+	* @param[in] dTemperatureInDegreeCelcius - Bed target temperature.
+	* @param[in] bWaitForTemp - If true, waits for the target bed temperature to be reached before proceeding
+	*/
+	void CDriver_Marlin::SetHeatedBedTargetTemperature(const LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, const bool bWaitForTemp)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_SetHeatedBedTargetTemperature(m_pHandle, dTemperatureInDegreeCelcius, bWaitForTemp));
+	}
+	
+	/**
+	* CDriver_Marlin::SetExtruderTargetTemperature - Sets target temperature of the given extruder.
+	* @param[in] nExtruderID - ID of extruder.
+	* @param[in] dTemperatureInDegreeCelcius - Extruder target temperature.
+	* @param[in] bWaitForTemp - If true, waits for the target extruder temperature to be reached before proceeding
+	*/
+	void CDriver_Marlin::SetExtruderTargetTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, const LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, const bool bWaitForTemp)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_SetExtruderTargetTemperature(m_pHandle, nExtruderID, dTemperatureInDegreeCelcius, bWaitForTemp));
+	}
+	
+	/**
+	* CDriver_Marlin::SetFanSpeed - Turns on one of the fans and set its speed.
+	* @param[in] nFanID - ID of fan.
+	* @param[in] nSpeed - Fan speed [0..255]. 0=0%!.(MISSING).255=100%!
+(MISSING)	*/
+	void CDriver_Marlin::SetFanSpeed(const LibMCDriver_Marlin_uint32 nFanID, const LibMCDriver_Marlin_uint32 nSpeed)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_SetFanSpeed(m_pHandle, nFanID, nSpeed));
+	}
+	
+	/**
+	* CDriver_Marlin::SetPidParameters - Sets PID parameters.
+	* @param[in] dP - New value for P parameter.
+	* @param[in] dI - New value for I parameter.
+	* @param[in] dD - New value for D parameter.
+	*/
+	void CDriver_Marlin::SetPidParameters(const LibMCDriver_Marlin_double dP, const LibMCDriver_Marlin_double dI, const LibMCDriver_Marlin_double dD)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_SetPidParameters(m_pHandle, dP, dI, dD));
+	}
+	
 	/**
 	* CDriver_Marlin::UpdateState - Polls a new state from the firmware.
 	*/
@@ -1007,14 +1216,44 @@ class CDriver_Marlin : public CDriver {
 	}
 	
 	/**
-	* CDriver_Marlin::GetExtruderTemperature - Returns the current temperature of an extruder.
-	* @param[in] nExtruderID - ID of Extruder
+	* CDriver_Marlin::GetExtruderTargetPosition - Returns the target extruder position.
+	* @param[out] dE - E Value in mm
+	*/
+	void CDriver_Marlin::GetExtruderTargetPosition(LibMCDriver_Marlin_double & dE)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_GetExtruderTargetPosition(m_pHandle, &dE));
+	}
+	
+	/**
+	* CDriver_Marlin::GetHeatedBedTemperature - Returns the current and the target bed temperature.
+	* @param[out] dTargetTemperature - Target Temperature in degree celsius.
 	* @param[out] dCurrentTemperature - Current Temperature in degree celsius.
+	*/
+	void CDriver_Marlin::GetHeatedBedTemperature(LibMCDriver_Marlin_double & dTargetTemperature, LibMCDriver_Marlin_double & dCurrentTemperature)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_GetHeatedBedTemperature(m_pHandle, &dTargetTemperature, &dCurrentTemperature));
+	}
+	
+	/**
+	* CDriver_Marlin::GetExtruderTemperature - Returns the current and the target temperature of an extruder.
+	* @param[in] nExtruderID - ID of Extruder
 	* @param[out] dTargetTemperature - Target Temperature in degree celsius.
+	* @param[out] dCurrentTemperature - Current Temperature in degree celsius.
 	*/
-	void CDriver_Marlin::GetExtruderTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double & dCurrentTemperature, LibMCDriver_Marlin_double & dTargetTemperature)
+	void CDriver_Marlin::GetExtruderTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double & dTargetTemperature, LibMCDriver_Marlin_double & dCurrentTemperature)
 	{
-		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_GetExtruderTemperature(m_pHandle, nExtruderID, &dCurrentTemperature, &dTargetTemperature));
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_GetExtruderTemperature(m_pHandle, nExtruderID, &dTargetTemperature, &dCurrentTemperature));
+	}
+	
+	/**
+	* CDriver_Marlin::GetPidParameters - Returns the current PID values.
+	* @param[out] dP - Current P value.
+	* @param[out] dI - Current I value.
+	* @param[out] dD - Current D value.
+	*/
+	void CDriver_Marlin::GetPidParameters(LibMCDriver_Marlin_double & dP, LibMCDriver_Marlin_double & dI, LibMCDriver_Marlin_double & dD)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_GetPidParameters(m_pHandle, &dP, &dI, &dD));
 	}
 	
 	/**
@@ -1042,27 +1281,67 @@ class CDriver_Marlin : public CDriver {
 	}
 	
 	/**
-	* CDriver_Marlin::MoveTo - Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
+	* CDriver_Marlin::IsHomed - Returns if the printer is homed
+	* @return True if printer is homed.
+	*/
+	bool CDriver_Marlin::IsHomed()
+	{
+		bool resultValue = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_IsHomed(m_pHandle, &resultValue));
+		
+		return resultValue;
+	}
+	
+	/**
+	* CDriver_Marlin::MoveToXY - Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
 	* @param[in] dX - X Value in mm
 	* @param[in] dY - Y Value in mm
-	* @param[in] dZ - Z Value in mm
+	* @param[in] dE - E Value in mm
 	* @param[in] dSpeed - Movement speed in mm/s
 	*/
-	void CDriver_Marlin::MoveTo(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed)
+	void CDriver_Marlin::MoveToXY(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dE, const LibMCDriver_Marlin_double dSpeed)
 	{
-		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_MoveTo(m_pHandle, dX, dY, dZ, dSpeed));
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_MoveToXY(m_pHandle, dX, dY, dE, dSpeed));
 	}
 	
 	/**
-	* CDriver_Marlin::MoveFastTo - Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
+	* CDriver_Marlin::MoveFastToXY - Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
 	* @param[in] dX - X Value in mm
 	* @param[in] dY - Y Value in mm
+	* @param[in] dSpeed - Movement speed in mm/s
+	*/
+	void CDriver_Marlin::MoveFastToXY(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dSpeed)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_MoveFastToXY(m_pHandle, dX, dY, dSpeed));
+	}
+	
+	/**
+	* CDriver_Marlin::MoveToZ - Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
 	* @param[in] dZ - Z Value in mm
+	* @param[in] dE - E Value in mm
 	* @param[in] dSpeed - Movement speed in mm/s
 	*/
-	void CDriver_Marlin::MoveFastTo(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed)
+	void CDriver_Marlin::MoveToZ(const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dE, const LibMCDriver_Marlin_double dSpeed)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_MoveToZ(m_pHandle, dZ, dE, dSpeed));
+	}
+	
+	/**
+	* CDriver_Marlin::MoveFastToZ - Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
+	* @param[in] dZ - Z Value in mm
+	* @param[in] dSpeed - Movement speed in mm/s
+	*/
+	void CDriver_Marlin::MoveFastToZ(const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_MoveFastToZ(m_pHandle, dZ, dSpeed));
+	}
+	
+	/**
+	* CDriver_Marlin::StartHoming - Start Homing of printer.
+	*/
+	void CDriver_Marlin::StartHoming()
 	{
-		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_MoveFastTo(m_pHandle, dX, dY, dZ, dSpeed));
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_Marlin_StartHoming(m_pHandle));
 	}
 
 } // namespace LibMCDriver_Marlin
diff --git a/Drivers/Marlin/Implementation/AMC_SerialController.hpp b/Drivers/Marlin/Implementation/AMC_SerialController.hpp
index 13819d2d..1aeebb76 100644
--- a/Drivers/Marlin/Implementation/AMC_SerialController.hpp
+++ b/Drivers/Marlin/Implementation/AMC_SerialController.hpp
@@ -5,6 +5,7 @@
 #include <string>
 #include <sstream>
 #include <iostream>
+#include <fstream>
 #include <memory>
 #include <vector>
 
@@ -34,8 +35,10 @@ namespace AMC {
 		virtual void setPositioningAbolute() = 0;
 		virtual void setPositioningRelative() = 0;
 
-		virtual void setHeatedBedTargetTemperature(double nTemperatureInDegreeCelcius) = 0;
-		virtual void setExtruderTargetTemperature(uint32_t nExtruderIndex, double nTemperatureInDegreeCelcius) = 0;
+		virtual void setHeatedBedTargetTemperature(double nTemperatureInDegreeCelcius, bool bWait) = 0;
+		virtual void setExtruderTargetTemperature(uint32_t nExtruderIndex, double nTemperatureInDegreeCelcius, bool bWait) = 0;
+		virtual void setFanSpeed(uint32_t nFanIndex, uint32_t nSpeed) = 0;
+		virtual void setPidParameters(double dP, double dI, double dD) = 0;
 
 		virtual void queryTemperatureState (uint32_t nExtruderIndex) = 0;
 		virtual void queryPositionState () = 0;
@@ -45,14 +48,19 @@ namespace AMC {
 
 		virtual void getTargetPosition (double & dX, double& dY, double& dZ) = 0;
 		virtual void getCurrentPosition(double& dX, double& dY, double& dZ) = 0;
-		virtual void getExtruderPosition (double &dE) = 0;
-			
+		virtual void getExtruderTargetPosition (double &dE) = 0;
+		virtual void getPidParameters(double& dP, double& dI, double& dD) = 0;
+
 		virtual void startHoming() = 0;
 		virtual void setLcdMsg(const std::string& sLcdMsg) = 0;
 
-		virtual void move(const double dX, const double dY, const double dZ, const double dSpeedInMMperSecond) = 0;
-		virtual void moveFast(const double dX, const double dY, const double dZ, const double dSpeedInMMperSecond) = 0;
+		virtual void moveXY(const double dX, const double dY, const double dE, const double dSpeedInMMperSecond) = 0;
+		virtual void moveFastXY(const double dX, const double dY, const double dSpeedInMMperSecond) = 0;
+
+		virtual void moveZ(const double dZ, const double dE, const double dSpeedInMMperSecond) = 0;
+		virtual void moveFastZ(const double dZ, const double dSpeedInMMperSecond) = 0;
 
+		virtual bool isHomed() = 0;
 		virtual bool isMoving() = 0;
 		virtual bool canReceiveMovement () = 0;
 		virtual void waitForMovement() = 0;
diff --git a/Drivers/Marlin/Implementation/AMC_SerialController_Marlin.cpp b/Drivers/Marlin/Implementation/AMC_SerialController_Marlin.cpp
index b3f937e5..f620fc15 100644
--- a/Drivers/Marlin/Implementation/AMC_SerialController_Marlin.cpp
+++ b/Drivers/Marlin/Implementation/AMC_SerialController_Marlin.cpp
@@ -30,23 +30,64 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "AMC_SerialController_Marlin.hpp"
 
+#include <algorithm>
 #include <thread>
 
+#ifdef __linux__
+#include <math.h>
+#endif
+
+#define MARLINDRIVER_MINSPEED 0.0001
+
 namespace AMC {
 
-	CSerialController_Marlin::CSerialController_Marlin(bool bDebug)
-		: m_sCOMPort ("COM1"), 
-		m_nBaudRate (115200), 
-		m_sAckSymbol ("ok"), 
-		m_nLineNumber (1), 
-		m_bDebug (bDebug),
-		m_sResendSymbol ("Resend:"), 
-		 m_nMinBufferSpace (3), m_nMaxBufferSpace (0), m_nCurrentBufferSpace (0)
+	CSerialController_Marlin::CSerialController_Marlin(bool bDebug, bool bDoQueryFirmwareInfo, bool bDisableHoming)
+		: m_sCOMPort("COM1"),
+		m_nBaudRate(115200),
+		m_nConnectTimeout(2000),
+		m_bDoQueryFirmwareInfo(bDoQueryFirmwareInfo),
+		m_bDisableHoming(bDisableHoming),
+		m_dStatusUpdateTimerInterval(100),
+		m_sAckSymbol("ok"),
+		m_nLineNumber(1),
+		m_bDebug(bDebug),
+		m_sResendSymbol("Resend:"),
+		m_nMinBufferSpace(3),
+		m_nMaxBufferSpace(0),
+		m_nCurrentBufferSpace(0),
+		m_bIsHomed(false),
+		m_iExtruderCount(0),
+		m_dCurrentBedTemp(0),
+		m_dTargetBedTemp(0),
+		m_dTargetPosX(0),
+		m_dTargetPosY(0),
+		m_dTargetPosZ(0),
+		m_dTargetPosE(0),
+		m_dCurrentPosX(0),
+		m_dCurrentPosY(0),
+		m_dCurrentPosZ(0),
+		m_dAxisStepsPerUnitX(0),
+		m_dAxisStepsPerUnitY(0),
+		m_dAxisStepsPerUnitZ(0),
+		m_dAxisStepsPerUnitE(0),
+		m_dCurrentSpeedInMMperSecond(0),
+		m_dPidValueP(0),
+		m_dPidValueI(0),
+		m_dPidValueD(0)
+
 	{
+		// If we disabled homing, then we expect to be at the home position at creation
+		if (m_bDisableHoming)
+			m_bIsHomed = true;
+	}
 
+	void CSerialController_Marlin::setStatusUpdateTimerInterval(const double dStatusUpdateTimerInterval)
+	{
+		m_dStatusUpdateTimerInterval = dStatusUpdateTimerInterval;
 	}
 
-	void CSerialController_Marlin::setCOMPort(const std::string& sCOMPort)
+
+		void CSerialController_Marlin::setCOMPort(const std::string& sCOMPort)
 	{
 		m_sCOMPort = sCOMPort;
 	}
@@ -58,7 +99,7 @@ namespace AMC {
 
 		return m_sCOMPort;
 	}
-
+	
 	void CSerialController_Marlin::setBaudrate(const uint32_t nBaudrate)
 	{
 		if (m_pConnection.get() != nullptr)
@@ -72,6 +113,19 @@ namespace AMC {
 		return m_nBaudRate;
 	}
 
+	void CSerialController_Marlin::setConnectTimeout(const uint32_t nConnectTimeout)
+	{
+		if (m_pConnection.get() != nullptr)
+			throw std::runtime_error("Serial Port already initialized");
+
+		m_nConnectTimeout = nConnectTimeout;
+	}
+
+	uint32_t CSerialController_Marlin::getConnectTimeout()
+	{
+		return m_nConnectTimeout;
+	}
+
 	CSerialController_Marlin::~CSerialController_Marlin()
 	{
 	}
@@ -81,25 +135,70 @@ namespace AMC {
 		if (m_pConnection.get() != nullptr)
 			throw std::runtime_error("Serial Port already initialized");
 
-		m_pConnection.reset(new serial::Serial(m_sCOMPort, m_nBaudRate, serial::Timeout::simpleTimeout(1000)));
+		// set timeout >1000 => 2000 (default of m_nConnectTimeout)
+		// 
+		// if printer is booting (echoing start+ Date+Memory... after switch on printer or plug in cable) and
+		// timeout would be 1000 the while loop below we be leaved "to early" (after timeout of 1sec) and
+		// the next command is sent, but printer can't respond to this command with OK,
+		// because he's not ready to receive commands => boot initialize hags up!!
+		//
+		// if printer is not booting (no echoing text... after software" reconnect)
+		// "start" will no be received,
+		// but timeout after 2000 will respond with an empty string and
+		// printer is ready to receive commands
+		m_pConnection.reset(new serial::Serial(m_sCOMPort, m_nBaudRate, serial::Timeout::simpleTimeout(m_nConnectTimeout)));
 
 		if (!m_pConnection->isOpen()) {
 			m_pConnection.reset();
 			throw std::runtime_error("Could not connect to serial port");
 		}
 
-		m_nLineNumber = 1;
+		// instead of waiting a fixed time wait until "start" or "" (after timeout) received from device??
+		//std::this_thread::sleep_for(std::chrono::milliseconds(500));
+		bool bAck = false;
+		while (!bAck) {
+			std::string sLineRead = m_pConnection->readline();
+			if (m_bDebug) {
+				std::cout << "RETURN: " << sLineRead << std::endl;
+			}
+
+			bAck = sLineRead.empty() || (sLineRead.find("start") != std::string::npos);
+		}
+
 
-		sendCommand("M110 N1");
+		// reset line number
+		std::stringstream sCommand;
+		sCommand << "M110 " << m_nLineNumber;
+		sendCommand(sCommand.str());
 
 		m_nCurrentBufferSpace = 0;
+
 		sendCommand("M400");
+		sendCommand("G21"); // set mm units
+		sendCommand("M149 C"); // set temperature unit to Celsius
+		sendCommand("M113 S1"); // keep alive period 0-60 possible, no decimals!
+		setPositioningAbolute();
 
 		if (m_nCurrentBufferSpace > 0) {
 			m_nMaxBufferSpace = m_nCurrentBufferSpace;
 		}
 
-		sendCommand("G21");
+		queryAxisStepsPerUnitStateAndPidValues();
+
+		m_iExtruderCount = 1;
+
+		if (m_bDoQueryFirmwareInfo)
+			queryFirmwareInfo();
+
+		// add an element to list of extruder for every detected extruder
+		for (uint32_t i = 0; i < m_iExtruderCount; ++i)
+		{
+			m_dTargetExtruderTemp.push_back(0);
+			m_dCurrentExtruderTemp.push_back(0);
+		}
+
+		checkIsHomed();
+
 
 	}
 
@@ -114,6 +213,35 @@ namespace AMC {
 		initializeController();
 	}
 
+
+
+	void CSerialController_Marlin::checkIsHomed()
+	{
+		if (m_pConnection.get() == nullptr)
+			throw std::runtime_error("Serial Port not initialized");
+
+		if (!m_bDisableHoming) {
+
+			// get endstops states
+			auto sStream = sendCommand("M119");
+			auto sLine = sStream.str();
+			std::transform(sLine.begin(), sLine.end(), sLine.begin(), ::tolower);
+
+			auto nPosition = sLine.find("_min: open\n");
+
+			if (nPosition == std::string::npos) {
+				// no axis is open => all are TRIGGERED => homed
+				m_bIsHomed = true;
+			}
+			else {
+				// at least on end stop of an axis is "open" => not homed
+				m_bIsHomed = false;
+			}
+
+		}
+
+	}
+
 	uint32_t CSerialController_Marlin::calculateLineChecksum(const std::string& sCommand)
 	{
 		uint32_t nChecksum = 0;
@@ -187,7 +315,6 @@ namespace AMC {
 			bool bResend = (sLineRead.find(m_sResendSymbol) != std::string::npos);
 			if (bResend) {
 				// For now fail, because firmware was not in reset state...
-				// TODO: Find out how to reset firmware
 				throw std::runtime_error("line number mismatch in firmware");
 			}
 
@@ -200,18 +327,238 @@ namespace AMC {
 
 
 
-	void CSerialController_Marlin::setHeatedBedTargetTemperature(double nTemperatureInDegreeCelcius)
+	void CSerialController_Marlin::setHeatedBedTargetTemperature(double nTemperatureInDegreeCelcius, bool bWait)
+	{
+		if (bWait) {
+			// wait for the target bed temperature to be reached before proceeding
+			sendCommand("M190 S" + std::to_string(nTemperatureInDegreeCelcius));
+		}
+		else {
+			// don't wait
+			sendCommand("M140 S" + std::to_string(nTemperatureInDegreeCelcius));
+		}
+	}
+
+	void CSerialController_Marlin::setExtruderTargetTemperature(uint32_t nExtruderIndex, double nTemperatureInDegreeCelcius, bool bWait)
 	{
+		if ((nExtruderIndex >= 0) && (nExtruderIndex < m_iExtruderCount))
+		{
+			if (bWait) {
+				// wait for the target extruder temperature to be reached before proceeding
+				sendCommand("M109 T" + std::to_string(nExtruderIndex) + " S" + std::to_string(nTemperatureInDegreeCelcius));
+			}
+			else {
+				// don't wait
+				sendCommand("M104 T" + std::to_string(nExtruderIndex) + " S" + std::to_string(nTemperatureInDegreeCelcius));
+			}
+		}
 	}
 
-	void CSerialController_Marlin::setExtruderTargetTemperature(uint32_t nExtruderIndex, double nTemperatureInDegreeCelcius)
+	void CSerialController_Marlin::setPidParameters(double dP, double dI, double dD)
 	{
+		sendCommand("M301 P" + std::to_string(dP) + " I" + std::to_string(dI) + " D" + std::to_string(dD));
+
+		m_dPidValueP = dP;
+		m_dPidValueI = dI;
+		m_dPidValueD = dD;
 
 	}
 
+	void CSerialController_Marlin::setFanSpeed(uint32_t nFanIndex, uint32_t nSpeed)
+	{
+		if ((nFanIndex >= 0))
+		{
+			if ((nSpeed > 0) && (nSpeed < 256))	 {
+				// turn fan on
+				sendCommand("M106 P" + std::to_string(nFanIndex) + " S" + std::to_string(nSpeed));
+			}
+			else {
+				// turn fan off
+				sendCommand("M107 P" + std::to_string(nFanIndex));
+			}
+		}
+	}
+	
 	void CSerialController_Marlin::queryTemperatureState(uint32_t nExtruderIndex)
 	{
-		auto sStream = sendCommand("M105 T" + std::to_string (nExtruderIndex));
+		if (nExtruderIndex < m_iExtruderCount)
+		{
+			auto sStream = sendCommand("M105 T" + std::to_string(nExtruderIndex));
+			auto sLine = sStream.str();
+			auto nPosition = sLine.find("T:");
+
+			if (nPosition == std::string::npos)
+				throw std::runtime_error("could not query extruder temperature state.");
+
+
+			// get extruder temperature
+			auto sExtruderTempPosString = sLine.substr(nPosition + 2);
+
+			auto nCurrentExtruderTempPosition = sExtruderTempPosString.find('/');
+			auto nTargetExtruderTempPosition = sExtruderTempPosString.find('B');
+
+			if (nCurrentExtruderTempPosition == std::string::npos)
+				throw std::runtime_error("could not find extruder current temperature position.");
+			if (nTargetExtruderTempPosition == std::string::npos)
+				throw std::runtime_error("could not find extruder target temperature position.");
+
+			if (!(nCurrentExtruderTempPosition < nTargetExtruderTempPosition))
+				throw std::runtime_error("invalid extruder temperature position order.");
+
+			auto sCurrentExtTemp = sExtruderTempPosString.substr(0, nCurrentExtruderTempPosition);
+			auto sTargetExtTemp = sExtruderTempPosString.substr(nCurrentExtruderTempPosition + 1, nTargetExtruderTempPosition - (nCurrentExtruderTempPosition + 1));
+
+			m_dCurrentExtruderTemp[nExtruderIndex] = std::stod(sCurrentExtTemp);
+			m_dTargetExtruderTemp[nExtruderIndex] = std::stod(sTargetExtTemp);
+
+
+			// get bed temperature
+			auto sBedTempPosString = sExtruderTempPosString.substr(nTargetExtruderTempPosition + 2);
+
+			auto nCurrentBedTempPosition = sBedTempPosString.find('/');
+			auto nTargetBedTempPosition = sBedTempPosString.find('@');
+
+			if (nCurrentBedTempPosition == std::string::npos)
+				throw std::runtime_error("could not find bed current temperature position.");
+			if (nTargetBedTempPosition == std::string::npos)
+				throw std::runtime_error("could not find bed target temperature position.");
+
+			if (!(nCurrentBedTempPosition < nTargetBedTempPosition))
+				throw std::runtime_error("invalid bed temperature position order.");
+
+			auto sCurrentBedTemp = sBedTempPosString.substr(0, nCurrentBedTempPosition);
+			auto sTargetBedTemp = sBedTempPosString.substr(nCurrentBedTempPosition + 1, nTargetBedTempPosition - (nCurrentBedTempPosition + 1));
+
+			m_dCurrentBedTemp = std::stod(sCurrentBedTemp);
+			m_dTargetBedTemp = std::stod(sTargetBedTemp);
+		}
+	}
+
+	void CSerialController_Marlin::queryAxisStepsPerUnitStateAndPidValues()
+	{
+		auto sStream = sendCommand("M503 S0");
+		auto sLine = sStream.str();
+
+		// get AXIS_STEPS_PER_UNIT
+		auto nPosition = sLine.find("M92");
+
+		if (nPosition == std::string::npos)
+			throw std::runtime_error("could not query axis_steps_per_unit state.");
+
+		auto sTempString = sLine.substr(nPosition + 4);
+		nPosition = sTempString.find("\n");
+		auto sAxisStepsPerUnitString = sTempString.substr(0, nPosition);
+
+		auto nAxisStepsPerUnitXPosition = sAxisStepsPerUnitString.find("X");
+		auto nAxisStepsPerUnitYPosition = sAxisStepsPerUnitString.find("Y");
+		auto nAxisStepsPerUnitZPosition = sAxisStepsPerUnitString.find("Z");
+		auto nAxisStepsPerUnitEPosition = sAxisStepsPerUnitString.find("E");
+
+		if (nAxisStepsPerUnitXPosition == std::string::npos)
+			throw std::runtime_error("could not find axis_steps_per_unit X position.");
+		if (nAxisStepsPerUnitYPosition == std::string::npos)
+			throw std::runtime_error("could not find axis_steps_per_unit Y position.");
+		if (nAxisStepsPerUnitZPosition == std::string::npos)
+			throw std::runtime_error("could not find axis_steps_per_unit Z position.");
+		if (nAxisStepsPerUnitEPosition == std::string::npos)
+			throw std::runtime_error("could not find axis_steps_per_unit E position.");
+
+		if (!((nAxisStepsPerUnitXPosition < nAxisStepsPerUnitYPosition) && (nAxisStepsPerUnitYPosition < nAxisStepsPerUnitZPosition) &&
+			(nAxisStepsPerUnitZPosition < nAxisStepsPerUnitEPosition)))
+			throw std::runtime_error("invalid axis_steps_per_unit position order.");
+
+		auto sAxis_steps_per_unitXString = sAxisStepsPerUnitString.substr(nAxisStepsPerUnitXPosition + 1, nAxisStepsPerUnitYPosition - (nAxisStepsPerUnitXPosition + 1));
+		auto sAxis_steps_per_unitYString = sAxisStepsPerUnitString.substr(nAxisStepsPerUnitYPosition + 1, nAxisStepsPerUnitZPosition - (nAxisStepsPerUnitYPosition + 1));
+		auto sAxis_steps_per_unitZString = sAxisStepsPerUnitString.substr(nAxisStepsPerUnitZPosition + 1, nAxisStepsPerUnitEPosition - (nAxisStepsPerUnitZPosition + 1));
+		auto sAxis_steps_per_unitEString = sAxisStepsPerUnitString.substr(nAxisStepsPerUnitEPosition + 1);
+
+		m_dAxisStepsPerUnitX = std::stod(sAxis_steps_per_unitXString);
+		m_dAxisStepsPerUnitY = std::stod(sAxis_steps_per_unitYString);
+		m_dAxisStepsPerUnitZ = std::stod(sAxis_steps_per_unitZString);
+		m_dAxisStepsPerUnitE = std::stod(sAxis_steps_per_unitEString);
+
+		// get PID values
+		nPosition = sLine.find("M301");
+
+		if (nPosition == std::string::npos)
+			throw std::runtime_error("could not query PID values.");
+
+		sTempString = sLine.substr(nPosition + 5);
+		nPosition = sTempString.find("\n");
+		auto sPidValuesString = sTempString.substr(0, nPosition);
+
+		auto nPidValuePPosition = sPidValuesString.find("P");
+		auto nPidValueIPosition = sPidValuesString.find("I");
+		auto nPidValueDPosition = sPidValuesString.find("D");
+
+		if (nPidValuePPosition == std::string::npos)
+			throw std::runtime_error("could not find PID value P position.");
+		if (nPidValueIPosition == std::string::npos)
+			throw std::runtime_error("could not find PID value I position.");
+		if (nPidValueDPosition == std::string::npos)
+			throw std::runtime_error("could not find PID value D position.");
+
+		if (!((nPidValuePPosition < nPidValueIPosition) && (nPidValueIPosition < nPidValueDPosition)))
+			throw std::runtime_error("invalid PID values position order.");
+
+		auto sPidValuePString = sPidValuesString.substr(nPidValuePPosition + 1, nPidValueIPosition - (nPidValuePPosition + 1));
+		auto sPidValueIString = sPidValuesString.substr(nPidValueIPosition + 1, nPidValueDPosition - (nPidValueIPosition + 1));
+		auto sPidValueDString = sPidValuesString.substr(nPidValueDPosition + 1);
+
+		m_dPidValueP = std::stod(sPidValuePString);
+		m_dPidValueI = std::stod(sPidValueIString);
+		m_dPidValueD = std::stod(sPidValueDString);
+
+	}
+
+	void CSerialController_Marlin::queryFirmwareInfo()
+	{
+		auto sStream = sendCommand("M115");
+		auto sLine = sStream.str();
+
+
+		const std::string sFirmwareName = "FIRMWARE_NAME:";
+		const std::string sSourceCodeUrl = "SOURCE_CODE_URL:";
+		const std::string sProtocolVersion = "PROTOCOL_VERSION:";
+		const std::string sMachineType = "MACHINE_TYPE:";
+		const std::string sExtruderCount = "EXTRUDER_COUNT:";
+		const std::string sUuid = "UUID:";
+
+		auto nPosFirmwareName = sLine.find(sFirmwareName);
+		auto nPosSourceCodeUrl = sLine.find(sSourceCodeUrl);
+		auto nPosProtocolVersion = sLine.find(sProtocolVersion);
+		auto nPosMachineType = sLine.find(sMachineType);
+		auto nPosExtruderCount = sLine.find(sExtruderCount);
+		auto nPosUuid = sLine.find(sUuid);
+		auto nPosEol = sLine.find("\n");
+
+		if (nPosFirmwareName == std::string::npos)
+			throw std::runtime_error("could not query FIRMWARE_NAME in firmware info.");
+		if (nPosSourceCodeUrl == std::string::npos)
+			throw std::runtime_error("could not query SOURCE_CODE_URL in firmware info.");
+		if (nPosProtocolVersion == std::string::npos)
+			throw std::runtime_error("could not query PROTOCOL_VERSION in firmware info.");
+		if (nPosMachineType == std::string::npos)
+			throw std::runtime_error("could not query MACHINE_TYPE in firmware info.");
+		if (nPosExtruderCount == std::string::npos)
+			throw std::runtime_error("could not query EXTRUDER_COUNT in firmware info.");
+		if (nPosUuid == std::string::npos)
+			throw std::runtime_error("could not query UUID in firmware info.");
+		if (nPosEol == std::string::npos)
+			throw std::runtime_error("could not query EOL in firmware info.");
+
+		if (!((nPosFirmwareName < nPosSourceCodeUrl) && (nPosSourceCodeUrl < nPosProtocolVersion) &&
+			(nPosProtocolVersion < nPosMachineType) && (nPosMachineType < nPosExtruderCount) &&
+			(nPosExtruderCount < nPosUuid) && (nPosUuid < nPosEol)))
+			throw std::runtime_error("invalid order of firmware info.");
+
+		m_sFirmwareName = sLine.substr(sFirmwareName.length(), nPosSourceCodeUrl - sFirmwareName.length() - 1);
+		m_sSourceCodeUrl = sLine.substr(nPosSourceCodeUrl + sSourceCodeUrl.length(), nPosProtocolVersion - (nPosSourceCodeUrl + sSourceCodeUrl.length() + 1));
+		m_sProtocolVersion = sLine.substr(nPosProtocolVersion + sProtocolVersion.length(), nPosMachineType - (nPosProtocolVersion + sProtocolVersion.length() + 1));
+		m_sMachineType = sLine.substr(nPosMachineType + sMachineType.length(), nPosExtruderCount - (nPosMachineType + sMachineType.length() + 1));
+		m_iExtruderCount = std::stoi(sLine.substr(nPosExtruderCount + sExtruderCount.length(), nPosUuid - (nPosExtruderCount + sExtruderCount.length() + 1)));
+		m_sUUID = sLine.substr(nPosUuid + sUuid.length(), nPosEol - (nPosUuid + sUuid.length())); 
+
 	}
 
 	void CSerialController_Marlin::queryPositionState()
@@ -258,6 +605,8 @@ namespace AMC {
 		auto nCurrentXPosition = sCurrentPosString.find("X:");
 		auto nCurrentYPosition = sCurrentPosString.find("Y:");
 		auto nCurrentZPosition = sCurrentPosString.find("Z:");
+		auto nCurrentEolPosition = sCurrentPosString.find("\n");
+
 
 		if (nCurrentXPosition == std::string::npos)
 			throw std::runtime_error("could not find current X position.");
@@ -271,26 +620,36 @@ namespace AMC {
 
 		auto sCurrentXString = sCurrentPosString.substr(nCurrentXPosition + 2, nCurrentYPosition - (nCurrentXPosition + 2));
 		auto sCurrentYString = sCurrentPosString.substr(nCurrentYPosition + 2, nCurrentZPosition - (nCurrentYPosition + 2));
-		auto sCurrentZString = sCurrentPosString.substr(nCurrentZPosition + 2);
+		auto sCurrentZString = sCurrentPosString.substr(nCurrentZPosition + 2, nCurrentEolPosition - (nCurrentZPosition + 2));
 
-		m_dCurrentPosX = std::stod(sCurrentXString);
-		m_dCurrentPosY = std::stod(sCurrentYString);
-		m_dCurrentPosZ = std::stod(sCurrentZString);
+		m_dCurrentPosX = std::stod(sCurrentXString) / m_dAxisStepsPerUnitX;;
+		m_dCurrentPosY = std::stod(sCurrentYString) / m_dAxisStepsPerUnitY;;
+		m_dCurrentPosZ = std::stod(sCurrentZString) / m_dAxisStepsPerUnitZ;;
 
 	}
 
 	void CSerialController_Marlin::getHeatedBedTemperature(double& dTargetTemperature, double& dCurrentTemperature)
 	{
-
+		dTargetTemperature = m_dTargetBedTemp;
+		dCurrentTemperature = m_dCurrentBedTemp;
 	}
 
 	void CSerialController_Marlin::getExtruderTemperature(uint32_t nExtruderIndex, double& dTargetTemperature, double& dCurrentTemperature)
 	{
-		dTargetTemperature = 0.0;
-		dCurrentTemperature = 0.0;
+		if (nExtruderIndex < m_iExtruderCount) {
+			dTargetTemperature = m_dTargetExtruderTemp[nExtruderIndex];
+			dCurrentTemperature = m_dCurrentExtruderTemp[nExtruderIndex];
+		}
 	}
 
 
+	void CSerialController_Marlin::getPidParameters(double& dP, double& dI, double& dD)
+	{
+		dP = m_dPidValueP;
+		dI = m_dPidValueI;
+		dD = m_dPidValueD;
+	}
+
 	void CSerialController_Marlin::getTargetPosition(double& dX, double& dY, double& dZ)
 	{
 		dX = m_dTargetPosX;
@@ -305,15 +664,18 @@ namespace AMC {
 		dZ = m_dCurrentPosZ;
 	}
 
-	void CSerialController_Marlin::getExtruderPosition(double& dE)
+	void CSerialController_Marlin::getExtruderTargetPosition(double& dE)
 	{
-		dE = m_dCurrentPosE;
+		dE = m_dTargetPosE;
 	}
 
 	void CSerialController_Marlin::startHoming()
 	{
-		sendCommand("G28");
+		if (!m_bDisableHoming) {
+			sendCommand("G28");
+		}
 		sendCommand("M400");
+		checkIsHomed();
 	}
 
 	void CSerialController_Marlin::setLcdMsg(const std::string& sLcdMsg)
@@ -332,32 +694,96 @@ namespace AMC {
 		sendCommand("G91");
 	}
 
-	void CSerialController_Marlin::move(const double dX, const double dY, const double dZ, const double dSpeedInMMperSecond)
+	void CSerialController_Marlin::moveToEx(bool bFastMove, 
+		bool bInX, const double dX, 
+		bool bInY, const double dY, 
+		bool bInZ, const double dZ,
+		bool bInE, const double dE,
+		const double dSpeedInMMperSecond)
 	{
 		std::stringstream sCommand;
-		sCommand << "G1 X" << dX << " Y" << dY << " Z" << dZ << " F" << dSpeedInMMperSecond * 60.0;
+
+		if (bFastMove) {
+			sCommand << "G0";
+		}
+		else {
+			sCommand << "G1";
+		}
+
+		if (bInX) {
+			// X given => add X+value to command str
+			sCommand << " X" << dX;
+		}
+		if (bInY) {
+			// Y given => add Y+value to command str
+			sCommand << " Y" << dY;
+		}
+		if (bInZ) {
+			// Z given => add Z+value to command str
+			sCommand << " Z" << dZ;
+		}
+		if (bInE && !bFastMove) {
+			// E given => add E+value to command str
+			// TODO remove to activate Extrusion
+			//sCommand << " E" << dE;
+		}
+		if (dSpeedInMMperSecond > 0) {
+			if (fabs(m_dCurrentSpeedInMMperSecond - dSpeedInMMperSecond) > MARLINDRIVER_MINSPEED) {
+				m_dCurrentSpeedInMMperSecond = dSpeedInMMperSecond;
+				sCommand << " F" << (int)(dSpeedInMMperSecond * 60.0);
+			}
+		}
 		sendCommand(sCommand.str());
 
-		m_dTargetPosX = dX;
-		m_dTargetPosY = dY;
-		m_dTargetPosZ = dZ;
+		if (bInX) {
+			m_dTargetPosX = dX;
+		}
+		if (bInY) {
+			m_dTargetPosY = dY;
+		}
+		if (bInZ) {
+			m_dTargetPosZ = dZ;
+		}
+		if (bInE) {
+			m_dTargetPosE = dE;
+		}
+	}
+
+
+	void CSerialController_Marlin::moveXY(const double dX, const double dY, const double dE, const double dSpeedInMMperSecond)
+	{
+		bool dInE = false;
+		if (fabs(dE) > MARLINDRIVER_MINSPEED) {
+			dInE = true;
+		}
+		moveToEx(false, true, dX, true, dY, false, 0.0, dInE, dE, dSpeedInMMperSecond);
 	}
 
-	void CSerialController_Marlin::moveFast(const double dX, const double dY, const double dZ, const double dSpeedInMMperSecond)
+	void CSerialController_Marlin::moveFastXY(const double dX, const double dY, const double dSpeedInMMperSecond)
 	{
-		std::stringstream sCommand;
-		sCommand << "G0 X" << dX << " Y" << dY << " Z" << dZ << " F" << dSpeedInMMperSecond * 60.0;
+		moveToEx(true, true, dX, true, dY, false, 0.0, false, 0.0, dSpeedInMMperSecond);
+	}
 
-		sendCommand(sCommand.str());
+	void CSerialController_Marlin::moveZ(const double dZ, const double dE, const double dSpeedInMMperSecond)
+	{
+		bool dInE = false;
+		if (fabs(dE) > MARLINDRIVER_MINSPEED) {
+			dInE = true;
+		}
+		moveToEx(false, false, 0.0, false, 0.0, true, dZ, dInE, dE, dSpeedInMMperSecond);
+	}
 
-		m_dTargetPosX = dX;
-		m_dTargetPosY = dY;
-		m_dTargetPosZ = dZ;
+	void CSerialController_Marlin::moveFastZ(const double dZ, const double dSpeedInMMperSecond)
+	{
+		moveToEx(true, false, 0.0, false, 0.0, true, dZ, false, 0.0, dSpeedInMMperSecond);
 	}
 
 	void CSerialController_Marlin::waitForMovement()
 	{
 		sendCommand("M400");		
+		// Print time (M31) responses immediately with ok (+ADVANCED_OK) + print time
+		// not added to the planning buffer
+		//sendCommand("M31");
 	}
 
 	bool CSerialController_Marlin::canReceiveMovement()
@@ -370,5 +796,10 @@ namespace AMC {
 		return (m_nCurrentBufferSpace != m_nMaxBufferSpace);
 	}
 
+	bool CSerialController_Marlin::isHomed()
+	{
+		return (m_bIsHomed);
+	}
+
 
-}
\ No newline at end of file
+}
diff --git a/Drivers/Marlin/Implementation/AMC_SerialController_Marlin.hpp b/Drivers/Marlin/Implementation/AMC_SerialController_Marlin.hpp
index 3b9bcc3e..608a44f5 100644
--- a/Drivers/Marlin/Implementation/AMC_SerialController_Marlin.hpp
+++ b/Drivers/Marlin/Implementation/AMC_SerialController_Marlin.hpp
@@ -12,13 +12,26 @@ namespace AMC {
 	class CSerialController_Marlin : public CSerialController {
 
 	private:
-
 		std::unique_ptr<serial::Serial> m_pConnection;
 		std::string m_sCOMPort;
 		uint32_t m_nBaudRate;
+		uint32_t m_nConnectTimeout;
 		uint32_t m_nLineNumber;
+		double m_dStatusUpdateTimerInterval;
 
 		bool m_bDebug;
+		bool m_bIsHomed;
+		bool m_bDoQueryFirmwareInfo;
+		bool m_bDisableHoming;
+
+		double m_dAxisStepsPerUnitX;
+		double m_dAxisStepsPerUnitY;
+		double m_dAxisStepsPerUnitZ;
+		double m_dAxisStepsPerUnitE;
+
+		double m_dPidValueP;
+		double m_dPidValueI;
+		double m_dPidValueD;
 
 		double m_dTargetPosX;
 		double m_dTargetPosY;
@@ -28,7 +41,21 @@ namespace AMC {
 		double m_dCurrentPosX;
 		double m_dCurrentPosY;
 		double m_dCurrentPosZ;
-		double m_dCurrentPosE;
+		double m_dCurrentSpeedInMMperSecond;
+
+		// firmware info
+		std::string m_sFirmwareName;
+		std::string m_sSourceCodeUrl;
+		std::string m_sProtocolVersion;
+		std::string m_sMachineType;
+		uint32_t m_iExtruderCount;
+		std::string m_sUUID;
+
+
+		std::vector<double> m_dCurrentExtruderTemp;
+		std::vector<double> m_dTargetExtruderTemp;
+		double m_dCurrentBedTemp;
+		double m_dTargetBedTemp;
 
 		std::string m_sAckSymbol;
 		std::string m_sResendSymbol;
@@ -37,15 +64,25 @@ namespace AMC {
 		uint32_t m_nMaxBufferSpace;
 		uint32_t m_nCurrentBufferSpace;
 
+
 		std::stringstream sendCommand(const std::string& sCommand);
 		uint32_t calculateLineChecksum (const std::string& sCommand);
+		void checkIsHomed();
 		bool parseAckSymbol(const std::string& sLine, const uint32_t nLineNumber);
-		
+		void queryAxisStepsPerUnitStateAndPidValues();
+		void queryFirmwareInfo();
+		void moveToEx (bool bFastMove, bool bInX, const double dX, bool bInY, const double dY, bool bInZ, const double dZ, bool bInE, const double dE, const double dSpeedInMMperSecond);
+
 	public:
-		CSerialController_Marlin(bool bDebug);
+		CSerialController_Marlin(bool bDebug, bool bDoQueryFirmwareInfo, bool bDisableHoming);
 		virtual ~CSerialController_Marlin();
 
-		void setCOMPort(const std::string & sCOMPort);
+		void setStatusUpdateTimerInterval(const double dStatusUpdateTimerInterval);
+
+		void setConnectTimeout(const uint32_t nConnectTimeout);
+		uint32_t getConnectTimeout();
+
+		void setCOMPort(const std::string& sCOMPort);
 		std::string getCOMPort();
 
 		void setBaudrate(const uint32_t nBaudrate);
@@ -58,8 +95,10 @@ namespace AMC {
 		void setPositioningAbolute();
 		void setPositioningRelative();
 
-		void setHeatedBedTargetTemperature(double nTemperatureInDegreeCelcius) override;
-		void setExtruderTargetTemperature(uint32_t nExtruderIndex, double nTemperatureInDegreeCelcius) override;
+		void setHeatedBedTargetTemperature(double nTemperatureInDegreeCelcius, bool bWait) override;
+		void setExtruderTargetTemperature(uint32_t nExtruderIndex, double nTemperatureInDegreeCelcius, bool bWait) override;
+		void setPidParameters(double dP, double dI, double dD) override;
+		void setFanSpeed(uint32_t nFanIndex, uint32_t nSpeed) override;
 
 		void queryTemperatureState(uint32_t nExtruderIndex) override;
 		void queryPositionState() override;
@@ -69,14 +108,18 @@ namespace AMC {
 
 		void getTargetPosition(double& dX, double& dY, double& dZ) override;
 		void getCurrentPosition(double& dX, double& dY, double& dZ) override;
-		void getExtruderPosition(double& dE) override;
+		void getExtruderTargetPosition(double& dE) override;
+		void getPidParameters(double& dP, double& dI, double& dD) override;
 
 		void startHoming() override;
 		void setLcdMsg(const std::string& sLcdMsg) override;
 
-		void move(const double dX, const double dY, const double dZ, const double dSpeedInMMperSecond) override;
-		void moveFast(const double dX, const double dY, const double dZ, const double dSpeedInMMperSecond) override;
+		void moveXY(const double dX, const double dY, const double dE, const double dSpeedInMMperSecond) override;
+		void moveFastXY(const double dX, const double dY, const double dSpeedInMMperSecond) override;
+		void moveZ(const double dZ, const double dE, const double dSpeedInMMperSecond) override;
+		void moveFastZ(const double dZ, const double dSpeedInMMperSecond) override;
 
+		bool isHomed() override;
 		bool isMoving() override;
 		bool canReceiveMovement() override;
 		void waitForMovement() override;
diff --git a/Drivers/Marlin/Implementation/libmcdriver_marlin.cpp b/Drivers/Marlin/Implementation/libmcdriver_marlin.cpp
index fa004438..92d4f569 100644
--- a/Drivers/Marlin/Implementation/libmcdriver_marlin.cpp
+++ b/Drivers/Marlin/Implementation/libmcdriver_marlin.cpp
@@ -70,8 +70,22 @@ void CWrapper::AcquireInstance(IBase* pInstance)
 
 IDriver * CWrapper::CreateDriver(const std::string& sName, const std::string& sType, LibMCDriverEnv::PDriverEnvironment pDriverEnvironment)
 {
-	if (sType == "marlin-2.0") 
-		return new CDriver_Marlin(sName, sType);
+
+	if (sType == "marlin-2.0") {
+		bool bDebug = false;
+		bool bDoFirmwareQuery = false;
+		bool bDisableHoming = true;
+
+		return new CDriver_Marlin(sName, sType, bDoFirmwareQuery, bDisableHoming, bDebug);
+	}
+
+	if (sType == "marlin-ender-2.0") {
+		bool bDebug = false;
+		bool bDoFirmwareQuery = true;
+		bool bDisableHoming = false;
+
+		return new CDriver_Marlin(sName, sType, bDoFirmwareQuery, bDisableHoming, bDebug);
+	}
 
 	throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_DRIVERERROR);
 	
diff --git a/Drivers/Marlin/Implementation/libmcdriver_marlin_driver_marlin.cpp b/Drivers/Marlin/Implementation/libmcdriver_marlin_driver_marlin.cpp
index 742fa380..309ff7fd 100644
--- a/Drivers/Marlin/Implementation/libmcdriver_marlin_driver_marlin.cpp
+++ b/Drivers/Marlin/Implementation/libmcdriver_marlin_driver_marlin.cpp
@@ -40,20 +40,21 @@ using namespace LibMCDriver_Marlin::Impl;
  Class definition of CDriver_Marlin 
 **************************************************************************************************************************/
 
-CDriver_Marlin::CDriver_Marlin(const std::string& sName, const std::string& sType)
-	: CDriver (sName, sType)
+CDriver_Marlin::CDriver_Marlin(const std::string& sName, const std::string& sType, const bool doQueryFirmwareInfo, const bool bDisableHoming, const bool bDebug)
+	: CDriver (sName, sType), m_doQueryFirmwareInfo (doQueryFirmwareInfo), m_bDisableHoming (bDisableHoming), m_bDebug (bDebug)
 {
-
 }
 
 
-void CDriver_Marlin::Connect(const std::string& sCOMPort, const LibMCDriver_Marlin_uint32 nBaudrate)
+void CDriver_Marlin::Connect(const std::string& sCOMPort, const LibMCDriver_Marlin_uint32 nBaudrate, const LibMCDriver_Marlin_double dStatusUpdateInterval, const LibMCDriver_Marlin_uint32 nConnectTimeout)
 {
 	Disconnect ();
 
-	auto pSerialController = std::make_shared<AMC::CSerialController_Marlin>(false);
+	auto pSerialController = std::make_shared<AMC::CSerialController_Marlin>(m_bDebug, m_doQueryFirmwareInfo, m_bDisableHoming);
 	pSerialController->setCOMPort(sCOMPort);
 	pSerialController->setBaudrate(nBaudrate);
+	pSerialController->setConnectTimeout(nConnectTimeout);
+	pSerialController->setStatusUpdateTimerInterval(dStatusUpdateInterval);
 	pSerialController->initializeController();
 	m_pSerialController = pSerialController;
 
@@ -80,7 +81,27 @@ void CDriver_Marlin::SetAbsolutePositioning(const bool bAbsolute)
 	}
 }
 
-void CDriver_Marlin::UpdateState() 
+void CDriver_Marlin::SetHeatedBedTargetTemperature(const LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, const bool bWaitForTemp)
+{
+	m_pSerialController->setHeatedBedTargetTemperature(dTemperatureInDegreeCelcius, bWaitForTemp);
+}
+
+void CDriver_Marlin::SetExtruderTargetTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, const LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, const bool bWaitForTemp)
+{
+	m_pSerialController->setExtruderTargetTemperature(nExtruderID, dTemperatureInDegreeCelcius, bWaitForTemp);
+}
+
+void CDriver_Marlin::SetFanSpeed(const LibMCDriver_Marlin_uint32 nFanID, const LibMCDriver_Marlin_uint32 nSpeed)
+{
+	m_pSerialController->setFanSpeed(nFanID, nSpeed);
+}
+
+void CDriver_Marlin::SetPidParameters(const LibMCDriver_Marlin_double dP, const LibMCDriver_Marlin_double dI, const LibMCDriver_Marlin_double dD)
+{
+	m_pSerialController->setPidParameters(dP, dI, dD);
+}
+
+void CDriver_Marlin::UpdateState()
 {
 	if (m_pSerialController.get() == nullptr)
 		throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_NOTCONNECTED);
@@ -99,6 +120,26 @@ void CDriver_Marlin::GetTargetPosition(LibMCDriver_Marlin_double& dX, LibMCDrive
 	m_pSerialController->getTargetPosition(dX, dY, dZ);
 }
 
+void CDriver_Marlin::GetExtruderTargetPosition(LibMCDriver_Marlin_double& dE)
+{
+	m_pSerialController->getExtruderTargetPosition(dE);
+}
+
+void CDriver_Marlin::GetHeatedBedTemperature(LibMCDriver_Marlin_double& dTargetTemperature, LibMCDriver_Marlin_double& dCurrentTemperature)
+{
+	m_pSerialController->getHeatedBedTemperature(dTargetTemperature, dCurrentTemperature);
+}
+
+void CDriver_Marlin::GetExtruderTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double& dTargetTemperature, LibMCDriver_Marlin_double& dCurrentTemperature)
+{
+	m_pSerialController->getExtruderTemperature(nExtruderID, dTargetTemperature, dCurrentTemperature);
+}
+
+void CDriver_Marlin::GetPidParameters(LibMCDriver_Marlin_double& dP, LibMCDriver_Marlin_double& dI, LibMCDriver_Marlin_double& dD)
+{
+	m_pSerialController->getPidParameters(dP, dI, dD);
+}
+
 bool CDriver_Marlin::CanExecuteMovement()
 {
 	return m_pSerialController->canReceiveMovement();
@@ -109,17 +150,34 @@ bool CDriver_Marlin::IsMoving()
 	return m_pSerialController->isMoving();
 }
 
-void CDriver_Marlin::MoveTo(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed)
+bool CDriver_Marlin::IsHomed()
 {
-	m_pSerialController->move(dX, dY, dZ, dSpeed);
+	return m_pSerialController->isHomed();
 }
 
-void CDriver_Marlin::MoveFastTo(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed)
+void CDriver_Marlin::MoveToXY(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dE, const LibMCDriver_Marlin_double dSpeed)
 {
-	m_pSerialController->moveFast(dX, dY, dZ, dSpeed);
+	m_pSerialController->moveXY(dX, dY, dE, dSpeed);
 }
 
-void CDriver_Marlin::GetExtruderTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double& dCurrentTemperature, LibMCDriver_Marlin_double& dTargetTemperature)
+void CDriver_Marlin::MoveFastToXY(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dSpeed)
 {
-	m_pSerialController->getExtruderTemperature(nExtruderID, dTargetTemperature, dCurrentTemperature);
-}
\ No newline at end of file
+	m_pSerialController->moveFastXY(dX, dY, dSpeed);
+}
+
+void CDriver_Marlin::MoveToZ(const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dE, const LibMCDriver_Marlin_double dSpeed)
+{
+	m_pSerialController->moveZ(dZ, dE, dSpeed);
+}
+
+void CDriver_Marlin::MoveFastToZ(const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed)
+{
+	m_pSerialController->moveFastZ(dZ, dSpeed);
+}
+
+
+
+void CDriver_Marlin::StartHoming()
+{
+	m_pSerialController->startHoming();
+}
diff --git a/Drivers/Marlin/Implementation/libmcdriver_marlin_driver_marlin.hpp b/Drivers/Marlin/Implementation/libmcdriver_marlin_driver_marlin.hpp
index 1d029407..68508d7c 100644
--- a/Drivers/Marlin/Implementation/libmcdriver_marlin_driver_marlin.hpp
+++ b/Drivers/Marlin/Implementation/libmcdriver_marlin_driver_marlin.hpp
@@ -38,32 +38,59 @@ class CDriver_Marlin : public virtual IDriver_Marlin, public virtual CDriver {
 protected:
 
 	AMC::PSerialController m_pSerialController;
+	bool m_doQueryFirmwareInfo;
+	bool m_bDisableHoming;
+	bool m_bDebug;
 
 public:
 
-	CDriver_Marlin(const std::string& sName, const std::string& sType);
+	CDriver_Marlin(const std::string& sName, const std::string& sType, const bool doQueryFirmwareInfo, const bool bDisableHoming, const bool bDebug);
 
-	void Connect(const std::string& sCOMPort, const LibMCDriver_Marlin_uint32 nBaudrate) override;
+	void Connect(const std::string& sCOMPort, const LibMCDriver_Marlin_uint32 nBaudrate, const LibMCDriver_Marlin_double dStatusUpdateInterval, const LibMCDriver_Marlin_uint32 nConnectTimeout) override;
 
 	void Disconnect() override;
 
 	void SetAbsolutePositioning(const bool bAbsolute) override;
 
+	void SetHeatedBedTargetTemperature(const LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, const bool bWaitForTemp) override;
+
+	void SetExtruderTargetTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, const LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, const bool bWaitForTemp) override;
+
+	void SetFanSpeed(const LibMCDriver_Marlin_uint32 nFanID, const LibMCDriver_Marlin_uint32 dSpeed) override;
+
+	void SetPidParameters(const LibMCDriver_Marlin_double dP, const LibMCDriver_Marlin_double dI, const LibMCDriver_Marlin_double dD) override;
+
 	void UpdateState() override;
 
 	void GetCurrentPosition(LibMCDriver_Marlin_double& dX, LibMCDriver_Marlin_double& dY, LibMCDriver_Marlin_double& dZ) override;
 
 	void GetTargetPosition(LibMCDriver_Marlin_double& dX, LibMCDriver_Marlin_double& dY, LibMCDriver_Marlin_double& dZ) override;
 
+	void GetExtruderTargetPosition(LibMCDriver_Marlin_double& dE) override;
+
+	void GetHeatedBedTemperature(LibMCDriver_Marlin_double& dTargetTemperature, LibMCDriver_Marlin_double& dCurrentTemperature) override;
+
+	void GetExtruderTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double& dTargetTemperature, LibMCDriver_Marlin_double& dCurrentTemperature) override;
+
+	void GetPidParameters(LibMCDriver_Marlin_double& dP, LibMCDriver_Marlin_double& dI, LibMCDriver_Marlin_double& dD) override;
+
 	bool CanExecuteMovement() override;
 
 	bool IsMoving() override;
 
-	void MoveTo(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed) override;
+	bool IsHomed() override;
+	
+	void MoveToXY(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dE, const LibMCDriver_Marlin_double dSpeed) override;
+
+	void MoveFastToXY(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dSpeed) override;
+	
+	void MoveToZ(const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dE, const LibMCDriver_Marlin_double dSpeed) override;
+	
+	void MoveFastToZ(const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed) override;
+
+	void StartHoming() override;
 
-	void MoveFastTo(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed) override;
 
-	void GetExtruderTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double& dCurrentTemperature, LibMCDriver_Marlin_double& dTargetTemperature) override;
 
 };
 
diff --git a/Drivers/Marlin/Interfaces/libmcdriver_marlin_abi.hpp b/Drivers/Marlin/Interfaces/libmcdriver_marlin_abi.hpp
index 4a922d34..c008d1ce 100644
--- a/Drivers/Marlin/Interfaces/libmcdriver_marlin_abi.hpp
+++ b/Drivers/Marlin/Interfaces/libmcdriver_marlin_abi.hpp
@@ -125,9 +125,11 @@ LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_g
 * @param[in] pDriver_Marlin - Driver_Marlin instance.
 * @param[in] pCOMPort - Device Port to connect to
 * @param[in] nBaudrate - Baudrate to use
+* @param[in] dStatusUpdateInterval - Timer interval [ms] for updating status
+* @param[in] nConnectTimeout - Timeout [ms] for connecting printer
 * @return error code or 0 (success)
 */
-LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_connect(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, const char * pCOMPort, LibMCDriver_Marlin_uint32 nBaudrate);
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_connect(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, const char * pCOMPort, LibMCDriver_Marlin_uint32 nBaudrate, LibMCDriver_Marlin_double dStatusUpdateInterval, LibMCDriver_Marlin_uint32 nConnectTimeout);
 
 /**
 * Disconnects from the Marlin board.
@@ -146,6 +148,48 @@ LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_m
 */
 LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setabsolutepositioning(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, bool bAbsolute);
 
+/**
+* Sets heated bed target temperature.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] dTemperatureInDegreeCelcius - Bed target temperature.
+* @param[in] bWaitForTemp - If true, waits for the target bed temperature to be reached before proceeding
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setheatedbedtargettemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, bool bWaitForTemp);
+
+/**
+* Sets target temperature of the given extruder.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] nExtruderID - ID of extruder.
+* @param[in] dTemperatureInDegreeCelcius - Extruder target temperature.
+* @param[in] bWaitForTemp - If true, waits for the target extruder temperature to be reached before proceeding
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setextrudertargettemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, bool bWaitForTemp);
+
+/**
+* Turns on one of the fans and set its speed.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] nFanID - ID of fan.
+* @param[in] nSpeed - Fan speed [0..255]. 0=0%!.(MISSING).255=100%!
+(MISSING)* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setfanspeed(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nFanID, LibMCDriver_Marlin_uint32 nSpeed);
+
+/**
+* Sets PID parameters.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] dP - New value for P parameter.
+* @param[in] dI - New value for I parameter.
+* @param[in] dD - New value for D parameter.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setpidparameters(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dP, LibMCDriver_Marlin_double dI, LibMCDriver_Marlin_double dD);
+
 /**
 * Polls a new state from the firmware.
 *
@@ -177,15 +221,45 @@ LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_m
 LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_gettargetposition(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pX, LibMCDriver_Marlin_double * pY, LibMCDriver_Marlin_double * pZ);
 
 /**
-* Returns the current temperature of an extruder.
+* Returns the target extruder position.
 *
 * @param[in] pDriver_Marlin - Driver_Marlin instance.
-* @param[in] nExtruderID - ID of Extruder
+* @param[out] pE - E Value in mm
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getextrudertargetposition(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pE);
+
+/**
+* Returns the current and the target bed temperature.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[out] pTargetTemperature - Target Temperature in degree celsius.
 * @param[out] pCurrentTemperature - Current Temperature in degree celsius.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getheatedbedtemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pTargetTemperature, LibMCDriver_Marlin_double * pCurrentTemperature);
+
+/**
+* Returns the current and the target temperature of an extruder.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] nExtruderID - ID of Extruder
 * @param[out] pTargetTemperature - Target Temperature in degree celsius.
+* @param[out] pCurrentTemperature - Current Temperature in degree celsius.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getextrudertemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double * pTargetTemperature, LibMCDriver_Marlin_double * pCurrentTemperature);
+
+/**
+* Returns the current PID values.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[out] pP - Current P value.
+* @param[out] pI - Current I value.
+* @param[out] pD - Current D value.
 * @return error code or 0 (success)
 */
-LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getextrudertemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double * pCurrentTemperature, LibMCDriver_Marlin_double * pTargetTemperature);
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getpidparameters(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pP, LibMCDriver_Marlin_double * pI, LibMCDriver_Marlin_double * pD);
 
 /**
 * Returns if the movement buffer can receive another movement command..
@@ -205,17 +279,26 @@ LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_m
 */
 LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_ismoving(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, bool * pValue);
 
+/**
+* Returns if the printer is homed
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[out] pValue - True if printer is homed.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_ishomed(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, bool * pValue);
+
 /**
 * Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
 *
 * @param[in] pDriver_Marlin - Driver_Marlin instance.
 * @param[in] dX - X Value in mm
 * @param[in] dY - Y Value in mm
-* @param[in] dZ - Z Value in mm
+* @param[in] dE - E Value in mm
 * @param[in] dSpeed - Movement speed in mm/s
 * @return error code or 0 (success)
 */
-LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_moveto(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dSpeed);
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movetoxy(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dE, LibMCDriver_Marlin_double dSpeed);
 
 /**
 * Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
@@ -223,11 +306,39 @@ LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_m
 * @param[in] pDriver_Marlin - Driver_Marlin instance.
 * @param[in] dX - X Value in mm
 * @param[in] dY - Y Value in mm
+* @param[in] dSpeed - Movement speed in mm/s
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movefasttoxy(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dSpeed);
+
+/**
+* Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @param[in] dZ - Z Value in mm
+* @param[in] dE - E Value in mm
+* @param[in] dSpeed - Movement speed in mm/s
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movetoz(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dE, LibMCDriver_Marlin_double dSpeed);
+
+/**
+* Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
 * @param[in] dZ - Z Value in mm
 * @param[in] dSpeed - Movement speed in mm/s
 * @return error code or 0 (success)
 */
-LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movefastto(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dSpeed);
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movefasttoz(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dSpeed);
+
+/**
+* Start Homing of printer.
+*
+* @param[in] pDriver_Marlin - Driver_Marlin instance.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_MARLIN_DECLSPEC LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_starthoming(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin);
 
 /*************************************************************************************************************************
  Global functions
diff --git a/Drivers/Marlin/Interfaces/libmcdriver_marlin_interfaces.hpp b/Drivers/Marlin/Interfaces/libmcdriver_marlin_interfaces.hpp
index cf98f1fe..6195cbcf 100644
--- a/Drivers/Marlin/Interfaces/libmcdriver_marlin_interfaces.hpp
+++ b/Drivers/Marlin/Interfaces/libmcdriver_marlin_interfaces.hpp
@@ -308,8 +308,10 @@ class IDriver_Marlin : public virtual IDriver {
 	* IDriver_Marlin::Connect - Creates and initializes a new Marlin Connector.
 	* @param[in] sCOMPort - Device Port to connect to
 	* @param[in] nBaudrate - Baudrate to use
+	* @param[in] dStatusUpdateInterval - Timer interval [ms] for updating status
+	* @param[in] nConnectTimeout - Timeout [ms] for connecting printer
 	*/
-	virtual void Connect(const std::string & sCOMPort, const LibMCDriver_Marlin_uint32 nBaudrate) = 0;
+	virtual void Connect(const std::string & sCOMPort, const LibMCDriver_Marlin_uint32 nBaudrate, const LibMCDriver_Marlin_double dStatusUpdateInterval, const LibMCDriver_Marlin_uint32 nConnectTimeout) = 0;
 
 	/**
 	* IDriver_Marlin::Disconnect - Disconnects from the Marlin board.
@@ -322,6 +324,36 @@ class IDriver_Marlin : public virtual IDriver {
 	*/
 	virtual void SetAbsolutePositioning(const bool bAbsolute) = 0;
 
+	/**
+	* IDriver_Marlin::SetHeatedBedTargetTemperature - Sets heated bed target temperature.
+	* @param[in] dTemperatureInDegreeCelcius - Bed target temperature.
+	* @param[in] bWaitForTemp - If true, waits for the target bed temperature to be reached before proceeding
+	*/
+	virtual void SetHeatedBedTargetTemperature(const LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, const bool bWaitForTemp) = 0;
+
+	/**
+	* IDriver_Marlin::SetExtruderTargetTemperature - Sets target temperature of the given extruder.
+	* @param[in] nExtruderID - ID of extruder.
+	* @param[in] dTemperatureInDegreeCelcius - Extruder target temperature.
+	* @param[in] bWaitForTemp - If true, waits for the target extruder temperature to be reached before proceeding
+	*/
+	virtual void SetExtruderTargetTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, const LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, const bool bWaitForTemp) = 0;
+
+	/**
+	* IDriver_Marlin::SetFanSpeed - Turns on one of the fans and set its speed.
+	* @param[in] nFanID - ID of fan.
+	* @param[in] nSpeed - Fan speed [0..255]. 0=0%...255=100%
+	*/
+	virtual void SetFanSpeed(const LibMCDriver_Marlin_uint32 nFanID, const LibMCDriver_Marlin_uint32 nSpeed) = 0;
+
+	/**
+	* IDriver_Marlin::SetPidParameters - Sets PID parameters.
+	* @param[in] dP - New value for P parameter.
+	* @param[in] dI - New value for I parameter.
+	* @param[in] dD - New value for D parameter.
+	*/
+	virtual void SetPidParameters(const LibMCDriver_Marlin_double dP, const LibMCDriver_Marlin_double dI, const LibMCDriver_Marlin_double dD) = 0;
+
 	/**
 	* IDriver_Marlin::UpdateState - Polls a new state from the firmware.
 	*/
@@ -344,12 +376,33 @@ class IDriver_Marlin : public virtual IDriver {
 	virtual void GetTargetPosition(LibMCDriver_Marlin_double & dX, LibMCDriver_Marlin_double & dY, LibMCDriver_Marlin_double & dZ) = 0;
 
 	/**
-	* IDriver_Marlin::GetExtruderTemperature - Returns the current temperature of an extruder.
-	* @param[in] nExtruderID - ID of Extruder
+	* IDriver_Marlin::GetExtruderTargetPosition - Returns the target extruder position.
+	* @param[out] dE - E Value in mm
+	*/
+	virtual void GetExtruderTargetPosition(LibMCDriver_Marlin_double & dE) = 0;
+
+	/**
+	* IDriver_Marlin::GetHeatedBedTemperature - Returns the current and the target bed temperature.
+	* @param[out] dTargetTemperature - Target Temperature in degree celsius.
 	* @param[out] dCurrentTemperature - Current Temperature in degree celsius.
+	*/
+	virtual void GetHeatedBedTemperature(LibMCDriver_Marlin_double & dTargetTemperature, LibMCDriver_Marlin_double & dCurrentTemperature) = 0;
+
+	/**
+	* IDriver_Marlin::GetExtruderTemperature - Returns the current and the target temperature of an extruder.
+	* @param[in] nExtruderID - ID of Extruder
 	* @param[out] dTargetTemperature - Target Temperature in degree celsius.
+	* @param[out] dCurrentTemperature - Current Temperature in degree celsius.
 	*/
-	virtual void GetExtruderTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double & dCurrentTemperature, LibMCDriver_Marlin_double & dTargetTemperature) = 0;
+	virtual void GetExtruderTemperature(const LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double & dTargetTemperature, LibMCDriver_Marlin_double & dCurrentTemperature) = 0;
+
+	/**
+	* IDriver_Marlin::GetPidParameters - Returns the current PID values.
+	* @param[out] dP - Current P value.
+	* @param[out] dI - Current I value.
+	* @param[out] dD - Current D value.
+	*/
+	virtual void GetPidParameters(LibMCDriver_Marlin_double & dP, LibMCDriver_Marlin_double & dI, LibMCDriver_Marlin_double & dD) = 0;
 
 	/**
 	* IDriver_Marlin::CanExecuteMovement - Returns if the movement buffer can receive another movement command..
@@ -364,22 +417,47 @@ class IDriver_Marlin : public virtual IDriver {
 	virtual bool IsMoving() = 0;
 
 	/**
-	* IDriver_Marlin::MoveTo - Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
+	* IDriver_Marlin::IsHomed - Returns if the printer is homed
+	* @return True if printer is homed.
+	*/
+	virtual bool IsHomed() = 0;
+
+	/**
+	* IDriver_Marlin::MoveToXY - Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
 	* @param[in] dX - X Value in mm
 	* @param[in] dY - Y Value in mm
-	* @param[in] dZ - Z Value in mm
+	* @param[in] dE - E Value in mm
 	* @param[in] dSpeed - Movement speed in mm/s
 	*/
-	virtual void MoveTo(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed) = 0;
+	virtual void MoveToXY(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dE, const LibMCDriver_Marlin_double dSpeed) = 0;
 
 	/**
-	* IDriver_Marlin::MoveFastTo - Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
+	* IDriver_Marlin::MoveFastToXY - Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
 	* @param[in] dX - X Value in mm
 	* @param[in] dY - Y Value in mm
+	* @param[in] dSpeed - Movement speed in mm/s
+	*/
+	virtual void MoveFastToXY(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dSpeed) = 0;
+
+	/**
+	* IDriver_Marlin::MoveToZ - Moves to/by a certain position by a linear move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
+	* @param[in] dZ - Z Value in mm
+	* @param[in] dE - E Value in mm
+	* @param[in] dSpeed - Movement speed in mm/s
+	*/
+	virtual void MoveToZ(const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dE, const LibMCDriver_Marlin_double dSpeed) = 0;
+
+	/**
+	* IDriver_Marlin::MoveFastToZ - Moves to/by a certain position by a fast move. Takes the relative/absolute mode into account. Fails if it cannot execute a movement.
 	* @param[in] dZ - Z Value in mm
 	* @param[in] dSpeed - Movement speed in mm/s
 	*/
-	virtual void MoveFastTo(const LibMCDriver_Marlin_double dX, const LibMCDriver_Marlin_double dY, const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed) = 0;
+	virtual void MoveFastToZ(const LibMCDriver_Marlin_double dZ, const LibMCDriver_Marlin_double dSpeed) = 0;
+
+	/**
+	* IDriver_Marlin::StartHoming - Start Homing of printer.
+	*/
+	virtual void StartHoming() = 0;
 
 };
 
diff --git a/Drivers/Marlin/Interfaces/libmcdriver_marlin_interfacewrapper.cpp b/Drivers/Marlin/Interfaces/libmcdriver_marlin_interfacewrapper.cpp
index 35195a56..8df5c462 100644
--- a/Drivers/Marlin/Interfaces/libmcdriver_marlin_interfacewrapper.cpp
+++ b/Drivers/Marlin/Interfaces/libmcdriver_marlin_interfacewrapper.cpp
@@ -297,7 +297,7 @@ LibMCDriver_MarlinResult libmcdriver_marlin_driver_getheaderinformation(LibMCDri
 /*************************************************************************************************************************
  Class implementation for Driver_Marlin
 **************************************************************************************************************************/
-LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_connect(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, const char * pCOMPort, LibMCDriver_Marlin_uint32 nBaudrate)
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_connect(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, const char * pCOMPort, LibMCDriver_Marlin_uint32 nBaudrate, LibMCDriver_Marlin_double dStatusUpdateInterval, LibMCDriver_Marlin_uint32 nConnectTimeout)
 {
 	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
 
@@ -309,7 +309,7 @@ LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_connect(LibMCDriver_Ma
 		if (!pIDriver_Marlin)
 			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
 		
-		pIDriver_Marlin->Connect(sCOMPort, nBaudrate);
+		pIDriver_Marlin->Connect(sCOMPort, nBaudrate, dStatusUpdateInterval, nConnectTimeout);
 
 		return LIBMCDRIVER_MARLIN_SUCCESS;
 	}
@@ -372,6 +372,102 @@ LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setabsolutepositioning
 	}
 }
 
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setheatedbedtargettemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, bool bWaitForTemp)
+{
+	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
+
+	try {
+		IDriver_Marlin* pIDriver_Marlin = dynamic_cast<IDriver_Marlin*>(pIBaseClass);
+		if (!pIDriver_Marlin)
+			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
+		
+		pIDriver_Marlin->SetHeatedBedTargetTemperature(dTemperatureInDegreeCelcius, bWaitForTemp);
+
+		return LIBMCDRIVER_MARLIN_SUCCESS;
+	}
+	catch (ELibMCDriver_MarlinInterfaceException & Exception) {
+		return handleLibMCDriver_MarlinException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setextrudertargettemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double dTemperatureInDegreeCelcius, bool bWaitForTemp)
+{
+	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
+
+	try {
+		IDriver_Marlin* pIDriver_Marlin = dynamic_cast<IDriver_Marlin*>(pIBaseClass);
+		if (!pIDriver_Marlin)
+			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
+		
+		pIDriver_Marlin->SetExtruderTargetTemperature(nExtruderID, dTemperatureInDegreeCelcius, bWaitForTemp);
+
+		return LIBMCDRIVER_MARLIN_SUCCESS;
+	}
+	catch (ELibMCDriver_MarlinInterfaceException & Exception) {
+		return handleLibMCDriver_MarlinException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setfanspeed(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nFanID, LibMCDriver_Marlin_uint32 nSpeed)
+{
+	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
+
+	try {
+		IDriver_Marlin* pIDriver_Marlin = dynamic_cast<IDriver_Marlin*>(pIBaseClass);
+		if (!pIDriver_Marlin)
+			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
+		
+		pIDriver_Marlin->SetFanSpeed(nFanID, nSpeed);
+
+		return LIBMCDRIVER_MARLIN_SUCCESS;
+	}
+	catch (ELibMCDriver_MarlinInterfaceException & Exception) {
+		return handleLibMCDriver_MarlinException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_setpidparameters(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dP, LibMCDriver_Marlin_double dI, LibMCDriver_Marlin_double dD)
+{
+	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
+
+	try {
+		IDriver_Marlin* pIDriver_Marlin = dynamic_cast<IDriver_Marlin*>(pIBaseClass);
+		if (!pIDriver_Marlin)
+			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
+		
+		pIDriver_Marlin->SetPidParameters(dP, dI, dD);
+
+		return LIBMCDRIVER_MARLIN_SUCCESS;
+	}
+	catch (ELibMCDriver_MarlinInterfaceException & Exception) {
+		return handleLibMCDriver_MarlinException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
 LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_updatestate(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin)
 {
 	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
@@ -456,20 +552,104 @@ LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_gettargetposition(LibM
 	}
 }
 
-LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getextrudertemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double * pCurrentTemperature, LibMCDriver_Marlin_double * pTargetTemperature)
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getextrudertargetposition(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pE)
 {
 	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
 
 	try {
+		if (!pE)
+			throw ELibMCDriver_MarlinInterfaceException (LIBMCDRIVER_MARLIN_ERROR_INVALIDPARAM);
+		IDriver_Marlin* pIDriver_Marlin = dynamic_cast<IDriver_Marlin*>(pIBaseClass);
+		if (!pIDriver_Marlin)
+			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
+		
+		pIDriver_Marlin->GetExtruderTargetPosition(*pE);
+
+		return LIBMCDRIVER_MARLIN_SUCCESS;
+	}
+	catch (ELibMCDriver_MarlinInterfaceException & Exception) {
+		return handleLibMCDriver_MarlinException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getheatedbedtemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pTargetTemperature, LibMCDriver_Marlin_double * pCurrentTemperature)
+{
+	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
+
+	try {
+		if (!pTargetTemperature)
+			throw ELibMCDriver_MarlinInterfaceException (LIBMCDRIVER_MARLIN_ERROR_INVALIDPARAM);
 		if (!pCurrentTemperature)
 			throw ELibMCDriver_MarlinInterfaceException (LIBMCDRIVER_MARLIN_ERROR_INVALIDPARAM);
+		IDriver_Marlin* pIDriver_Marlin = dynamic_cast<IDriver_Marlin*>(pIBaseClass);
+		if (!pIDriver_Marlin)
+			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
+		
+		pIDriver_Marlin->GetHeatedBedTemperature(*pTargetTemperature, *pCurrentTemperature);
+
+		return LIBMCDRIVER_MARLIN_SUCCESS;
+	}
+	catch (ELibMCDriver_MarlinInterfaceException & Exception) {
+		return handleLibMCDriver_MarlinException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getextrudertemperature(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_uint32 nExtruderID, LibMCDriver_Marlin_double * pTargetTemperature, LibMCDriver_Marlin_double * pCurrentTemperature)
+{
+	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
+
+	try {
 		if (!pTargetTemperature)
 			throw ELibMCDriver_MarlinInterfaceException (LIBMCDRIVER_MARLIN_ERROR_INVALIDPARAM);
+		if (!pCurrentTemperature)
+			throw ELibMCDriver_MarlinInterfaceException (LIBMCDRIVER_MARLIN_ERROR_INVALIDPARAM);
 		IDriver_Marlin* pIDriver_Marlin = dynamic_cast<IDriver_Marlin*>(pIBaseClass);
 		if (!pIDriver_Marlin)
 			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
 		
-		pIDriver_Marlin->GetExtruderTemperature(nExtruderID, *pCurrentTemperature, *pTargetTemperature);
+		pIDriver_Marlin->GetExtruderTemperature(nExtruderID, *pTargetTemperature, *pCurrentTemperature);
+
+		return LIBMCDRIVER_MARLIN_SUCCESS;
+	}
+	catch (ELibMCDriver_MarlinInterfaceException & Exception) {
+		return handleLibMCDriver_MarlinException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_getpidparameters(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double * pP, LibMCDriver_Marlin_double * pI, LibMCDriver_Marlin_double * pD)
+{
+	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
+
+	try {
+		if (!pP)
+			throw ELibMCDriver_MarlinInterfaceException (LIBMCDRIVER_MARLIN_ERROR_INVALIDPARAM);
+		if (!pI)
+			throw ELibMCDriver_MarlinInterfaceException (LIBMCDRIVER_MARLIN_ERROR_INVALIDPARAM);
+		if (!pD)
+			throw ELibMCDriver_MarlinInterfaceException (LIBMCDRIVER_MARLIN_ERROR_INVALIDPARAM);
+		IDriver_Marlin* pIDriver_Marlin = dynamic_cast<IDriver_Marlin*>(pIBaseClass);
+		if (!pIDriver_Marlin)
+			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
+		
+		pIDriver_Marlin->GetPidParameters(*pP, *pI, *pD);
 
 		return LIBMCDRIVER_MARLIN_SUCCESS;
 	}
@@ -536,7 +716,105 @@ LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_ismoving(LibMCDriver_M
 	}
 }
 
-LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_moveto(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dSpeed)
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_ishomed(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, bool * pValue)
+{
+	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
+
+	try {
+		if (pValue == nullptr)
+			throw ELibMCDriver_MarlinInterfaceException (LIBMCDRIVER_MARLIN_ERROR_INVALIDPARAM);
+		IDriver_Marlin* pIDriver_Marlin = dynamic_cast<IDriver_Marlin*>(pIBaseClass);
+		if (!pIDriver_Marlin)
+			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
+		
+		*pValue = pIDriver_Marlin->IsHomed();
+
+		return LIBMCDRIVER_MARLIN_SUCCESS;
+	}
+	catch (ELibMCDriver_MarlinInterfaceException & Exception) {
+		return handleLibMCDriver_MarlinException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movetoxy(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dE, LibMCDriver_Marlin_double dSpeed)
+{
+	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
+
+	try {
+		IDriver_Marlin* pIDriver_Marlin = dynamic_cast<IDriver_Marlin*>(pIBaseClass);
+		if (!pIDriver_Marlin)
+			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
+		
+		pIDriver_Marlin->MoveToXY(dX, dY, dE, dSpeed);
+
+		return LIBMCDRIVER_MARLIN_SUCCESS;
+	}
+	catch (ELibMCDriver_MarlinInterfaceException & Exception) {
+		return handleLibMCDriver_MarlinException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movefasttoxy(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dSpeed)
+{
+	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
+
+	try {
+		IDriver_Marlin* pIDriver_Marlin = dynamic_cast<IDriver_Marlin*>(pIBaseClass);
+		if (!pIDriver_Marlin)
+			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
+		
+		pIDriver_Marlin->MoveFastToXY(dX, dY, dSpeed);
+
+		return LIBMCDRIVER_MARLIN_SUCCESS;
+	}
+	catch (ELibMCDriver_MarlinInterfaceException & Exception) {
+		return handleLibMCDriver_MarlinException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movetoz(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dE, LibMCDriver_Marlin_double dSpeed)
+{
+	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
+
+	try {
+		IDriver_Marlin* pIDriver_Marlin = dynamic_cast<IDriver_Marlin*>(pIBaseClass);
+		if (!pIDriver_Marlin)
+			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
+		
+		pIDriver_Marlin->MoveToZ(dZ, dE, dSpeed);
+
+		return LIBMCDRIVER_MARLIN_SUCCESS;
+	}
+	catch (ELibMCDriver_MarlinInterfaceException & Exception) {
+		return handleLibMCDriver_MarlinException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movefasttoz(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dSpeed)
 {
 	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
 
@@ -545,7 +823,7 @@ LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_moveto(LibMCDriver_Mar
 		if (!pIDriver_Marlin)
 			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
 		
-		pIDriver_Marlin->MoveTo(dX, dY, dZ, dSpeed);
+		pIDriver_Marlin->MoveFastToZ(dZ, dSpeed);
 
 		return LIBMCDRIVER_MARLIN_SUCCESS;
 	}
@@ -560,7 +838,7 @@ LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_moveto(LibMCDriver_Mar
 	}
 }
 
-LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movefastto(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin, LibMCDriver_Marlin_double dX, LibMCDriver_Marlin_double dY, LibMCDriver_Marlin_double dZ, LibMCDriver_Marlin_double dSpeed)
+LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_starthoming(LibMCDriver_Marlin_Driver_Marlin pDriver_Marlin)
 {
 	IBase* pIBaseClass = (IBase *)pDriver_Marlin;
 
@@ -569,7 +847,7 @@ LibMCDriver_MarlinResult libmcdriver_marlin_driver_marlin_movefastto(LibMCDriver
 		if (!pIDriver_Marlin)
 			throw ELibMCDriver_MarlinInterfaceException(LIBMCDRIVER_MARLIN_ERROR_INVALIDCAST);
 		
-		pIDriver_Marlin->MoveFastTo(dX, dY, dZ, dSpeed);
+		pIDriver_Marlin->StartHoming();
 
 		return LIBMCDRIVER_MARLIN_SUCCESS;
 	}
@@ -613,22 +891,44 @@ LibMCDriver_MarlinResult LibMCDriver_Marlin::Impl::LibMCDriver_Marlin_GetProcAdd
 		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_disconnect;
 	if (sProcName == "libmcdriver_marlin_driver_marlin_setabsolutepositioning") 
 		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_setabsolutepositioning;
+	if (sProcName == "libmcdriver_marlin_driver_marlin_setheatedbedtargettemperature") 
+		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_setheatedbedtargettemperature;
+	if (sProcName == "libmcdriver_marlin_driver_marlin_setextrudertargettemperature") 
+		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_setextrudertargettemperature;
+	if (sProcName == "libmcdriver_marlin_driver_marlin_setfanspeed") 
+		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_setfanspeed;
+	if (sProcName == "libmcdriver_marlin_driver_marlin_setpidparameters") 
+		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_setpidparameters;
 	if (sProcName == "libmcdriver_marlin_driver_marlin_updatestate") 
 		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_updatestate;
 	if (sProcName == "libmcdriver_marlin_driver_marlin_getcurrentposition") 
 		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_getcurrentposition;
 	if (sProcName == "libmcdriver_marlin_driver_marlin_gettargetposition") 
 		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_gettargetposition;
+	if (sProcName == "libmcdriver_marlin_driver_marlin_getextrudertargetposition") 
+		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_getextrudertargetposition;
+	if (sProcName == "libmcdriver_marlin_driver_marlin_getheatedbedtemperature") 
+		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_getheatedbedtemperature;
 	if (sProcName == "libmcdriver_marlin_driver_marlin_getextrudertemperature") 
 		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_getextrudertemperature;
+	if (sProcName == "libmcdriver_marlin_driver_marlin_getpidparameters") 
+		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_getpidparameters;
 	if (sProcName == "libmcdriver_marlin_driver_marlin_canexecutemovement") 
 		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_canexecutemovement;
 	if (sProcName == "libmcdriver_marlin_driver_marlin_ismoving") 
 		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_ismoving;
-	if (sProcName == "libmcdriver_marlin_driver_marlin_moveto") 
-		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_moveto;
-	if (sProcName == "libmcdriver_marlin_driver_marlin_movefastto") 
-		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_movefastto;
+	if (sProcName == "libmcdriver_marlin_driver_marlin_ishomed") 
+		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_ishomed;
+	if (sProcName == "libmcdriver_marlin_driver_marlin_movetoxy") 
+		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_movetoxy;
+	if (sProcName == "libmcdriver_marlin_driver_marlin_movefasttoxy") 
+		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_movefasttoxy;
+	if (sProcName == "libmcdriver_marlin_driver_marlin_movetoz") 
+		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_movetoz;
+	if (sProcName == "libmcdriver_marlin_driver_marlin_movefasttoz") 
+		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_movefasttoz;
+	if (sProcName == "libmcdriver_marlin_driver_marlin_starthoming") 
+		*ppProcAddress = (void*) &libmcdriver_marlin_driver_marlin_starthoming;
 	if (sProcName == "libmcdriver_marlin_getversion") 
 		*ppProcAddress = (void*) &libmcdriver_marlin_getversion;
 	if (sProcName == "libmcdriver_marlin_getlasterror") 
diff --git a/Drivers/ScanLabOIE/ACT/LibMCDriver_ScanLabOIE.xml b/Drivers/ScanLabOIE/ACT/LibMCDriver_ScanLabOIE.xml
new file mode 100644
index 00000000..25ce965d
--- /dev/null
+++ b/Drivers/ScanLabOIE/ACT/LibMCDriver_ScanLabOIE.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component xmlns="http://schemas.autodesk.com/netfabb/automaticcomponenttoolkit/2018" 
+	libraryname="MC Driver ScanLab Open Interface Extension" namespace="LibMCDriver_ScanLabOIE" copyright="Autodesk Inc." year="2020" basename="libmcdriver_scanlaboie"
+	version="1.0.0">
+	<license>
+		<line value="All rights reserved." />
+		<line value="" />
+		<line value="Redistribution and use in source and binary forms, with or without" />
+		<line value="modification, are permitted provided that the following conditions are met:" />
+		<line value="    * Redistributions of source code must retain the above copyright" />
+		<line value="      notice, this list of conditions and the following disclaimer." />
+		<line value="    * Redistributions in binary form must reproduce the above copyright" />
+		<line value="      notice, this list of conditions and the following disclaimer in the" />
+		<line value="      documentation and/or other materials provided with the distribution." />
+		<line value="    * Neither the name of the Autodesk Inc. nor the" />
+		<line value="      names of its contributors may be used to endorse or promote products" />
+		<line value="      derived from this software without specific prior written permission." />
+		<line value="" />
+		<line value="THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND" />
+		<line value="ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED" />
+		<line value="WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE" />
+		<line value="DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY" />
+		<line value="DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES" />
+		<line value="(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;" />
+		<line value="LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND" />
+		<line value="ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT" />
+		<line value="(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS" />
+		<line value="SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." />
+		<line value="" />
+	</license>
+	
+	<bindings>
+		<binding language="CppDynamic" indentation="tabs" />
+	</bindings>
+	<implementations>
+		<implementation language="Cpp" indentation="tabs"/>
+	</implementations>
+	
+	
+	<importcomponent uri="../../../ACT/LibMCDriverEnv.xml" namespace="LibMCDriverEnv"/>
+	
+	<errors>
+		<error name="NOTIMPLEMENTED" code="1" description="functionality not implemented" />
+		<error name="INVALIDPARAM" code="2" description="an invalid parameter was passed" />
+		<error name="INVALIDCAST" code="3" description="a type cast failed" />
+		<error name="BUFFERTOOSMALL" code="4" description="a provided buffer is too small" />
+		<error name="GENERICEXCEPTION" code="5" description="a generic exception occurred" />
+		<error name="COULDNOTLOADLIBRARY" code="6" description="the library could not be loaded" />
+		<error name="COULDNOTFINDLIBRARYEXPORT" code="7" description="a required exported symbol could not be found in the library" />
+		<error name="INCOMPATIBLEBINARYVERSION" code="8" description="the version of the binary interface does not match the bindings interface" />
+			
+	</errors>
+	
+	
+<!--
+
+This base Driver interface MUST be in Sync with LibMCDriver.xml
+
+-->
+	
+	<class name="Base">
+	</class>
+	
+	<class name="Driver" parent="Base" description="An abstract Machine Control Driver">
+	
+		<method name="GetName" description = "returns the name identifier of the driver">
+			<param name="Name" type="string" pass="return" description="Name of the driver." />
+		</method>
+
+		<method name="GetType" description = "returns the type identifier of the driver">
+			<param name="Type" type="string" pass="return" description="Type of the driver." />
+		</method>
+
+		<method name="GetVersion" description = "returns the version identifiers of the driver">
+			<param name="Major" type="uint32" pass="out" description="Major version." />
+			<param name="Minor" type="uint32" pass="out" description="Minor version." />
+			<param name="Micro" type="uint32" pass="out" description="Micro version." />
+			<param name="Build" type="string" pass="out" description="Build identifier." />
+		</method>
+
+		<method name="GetHeaderInformation" description = "returns the header information">
+			<param name="NameSpace" type="string" pass="out" description="NameSpace of the driver." />
+			<param name="BaseName" type="string" pass="out" description="BaseName of the driver." />
+		</method>
+	
+	</class>
+
+<!--
+
+End Interface
+
+-->
+
+
+<!--
+
+Custom implementation
+
+-->
+
+
+
+	<class name="Driver_ScanLab_OIE" parent="Driver" description="A Driver for the ScanLab OIE Extension.">
+
+	
+	</class>
+
+
+
+<!--
+
+End of Custom implementation
+
+-->
+
+		
+	<global baseclassname="Base" stringoutclassname="Base" releasemethod="ReleaseInstance" acquiremethod="AcquireInstance" versionmethod="GetVersion" errormethod="GetLastError" injectionmethod="InjectComponent" symbollookupmethod="GetSymbolLookupMethod">
+		
+		<method name="GetVersion" description = "retrieves the binary version of this library.">
+			<param name="Major" type="uint32" pass="out" description="returns the major version of this library" />
+			<param name="Minor" type="uint32" pass="out" description="returns the minor version of this library" />
+			<param name="Micro" type="uint32" pass="out" description="returns the micro version of this library" />
+		</method>
+		<method name="GetLastError" description="Returns the last error recorded on this object">
+			<param name="Instance" type="class" class="Base" pass="in" description="Instance Handle" />
+			<param name="ErrorMessage" type="string" pass="out" description="Message of the last error" />
+			<param name="HasError" type="bool" pass="return" description="Is there a last error to query" />
+		</method>
+		<method name="ReleaseInstance" description="Releases shared ownership of an Instance">
+			<param name="Instance" type="class" class="Base" pass="in" description="Instance Handle" />
+		</method>
+		<method name="AcquireInstance" description="Acquires shared ownership of an Instance">
+			<param name="Instance" type="class" class="Base" pass="in" description="Instance Handle" />
+		</method>
+		<method name="InjectComponent" description="Injects an imported component for usage within this component">
+			<param name="NameSpace" type="string" pass="in" description="NameSpace of the injected component" />
+			<param name="SymbolAddressMethod" type="pointer" pass="in" description="Address of the SymbolAddressMethod of the injected component" />
+		</method>		
+		<method name="GetSymbolLookupMethod" description="Returns the address of the SymbolLookupMethod">
+			<param name="SymbolLookupMethod" type="pointer" pass="return" description="Address of the SymbolAddressMethod" />
+		</method>				
+		<method name="CreateDriver" description="Creates a driver instance with a specific name.">
+			<param name="Name" type="string" pass="in" description="Name of driver to be created." />
+			<param name="Type" type="string" pass="in" description="Type of driver to be created." />
+			<param name="DriverEnvironment" type="class" class="LibMCDriverEnv:DriverEnvironment" pass="in" description="Environment of this driver." />
+			<param name="Instance" type="class" class="Driver" pass="return" description="New Driver instance" />
+		</method>
+		
+	</global>
+	
+	
+</component>
+
diff --git a/Drivers/ScanLabOIE/ACT/LibOIE.xml b/Drivers/ScanLabOIE/ACT/LibOIE.xml
new file mode 100644
index 00000000..4f88cd46
--- /dev/null
+++ b/Drivers/ScanLabOIE/ACT/LibOIE.xml
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component xmlns="http://schemas.autodesk.com/netfabb/automaticcomponenttoolkit/2018" 
+	libraryname="ScanLab Open Interface Extension" namespace="LibOIE" copyright="Autodesk Inc." year="2020" basename="liboie"
+	version="1.0.0">
+	<license>
+		<line value="All rights reserved." />
+		<line value="" />
+		<line value="Redistribution and use in source and binary forms, with or without" />
+		<line value="modification, are permitted provided that the following conditions are met:" />
+		<line value="    * Redistributions of source code must retain the above copyright" />
+		<line value="      notice, this list of conditions and the following disclaimer." />
+		<line value="    * Redistributions in binary form must reproduce the above copyright" />
+		<line value="      notice, this list of conditions and the following disclaimer in the" />
+		<line value="      documentation and/or other materials provided with the distribution." />
+		<line value="    * Neither the name of the Autodesk Inc. nor the" />
+		<line value="      names of its contributors may be used to endorse or promote products" />
+		<line value="      derived from this software without specific prior written permission." />
+		<line value="" />
+		<line value="THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND" />
+		<line value="ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED" />
+		<line value="WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE" />
+		<line value="DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY" />
+		<line value="DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES" />
+		<line value="(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;" />
+		<line value="LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND" />
+		<line value="ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT" />
+		<line value="(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS" />
+		<line value="SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." />
+		<line value="" />
+	</license>
+	
+	<bindings>
+		<binding language="CppDynamic" indentation="tabs" />
+	</bindings>
+	<implementations>
+		<implementation language="Cpp" indentation="tabs"/>
+	</implementations>
+	
+	
+	
+	<errors>
+		<error name="NOTIMPLEMENTED" code="1" description="functionality not implemented" />
+		<error name="INVALIDPARAM" code="2" description="an invalid parameter was passed" />
+		<error name="INVALIDCAST" code="3" description="a type cast failed" />
+		<error name="BUFFERTOOSMALL" code="4" description="a provided buffer is too small" />
+		<error name="GENERICEXCEPTION" code="5" description="a generic exception occurred" />
+		<error name="COULDNOTLOADLIBRARY" code="6" description="the library could not be loaded" />
+		<error name="COULDNOTFINDLIBRARYEXPORT" code="7" description="a required exported symbol could not be found in the library" />
+		<error name="INCOMPATIBLEBINARYVERSION" code="8" description="the version of the binary interface does not match the bindings interface" />
+	</errors>
+
+
+	<functiontype name="ConnectionAcceptedCallback" description="A callback that is triggered when a device or application has connected.">
+		<param name="ConnectionInstance" type="class" class="Connection" pass="in" description="Returns whether the calculation should be aborted"/>
+		<param name="UserData" type="pointer" pass="in" description="Userdata that is passed to the callback function"/>
+	</functiontype>
+
+	<functiontype name="ConnectionRejectedCallback" description="A callback that is triggered when a device or application has been denied connecting.">
+		<param name="DeviceName" type="string" pass="in" description="Device name that was sent." />
+		<param name="ApplicationName" type="string" pass="in" description="Application name that was sent." />
+		<param name="VersionName" type="string" pass="in" description="Version name that was sent." />
+		<param name="UserData" type="pointer" pass="in" description="Userdata that is passed to the callback function"/>
+	</functiontype>
+
+	<functiontype name="ConnectionErrorCallback" description="A callback that is triggered when a connection sends an error state.">
+		<param name="ErrorMessage" type="string" pass="in" description="Error string that was triggered." />
+	</functiontype>
+	
+	<class name="Base">
+	</class>
+
+	<class name="Iterator" parent="Base">
+		<method name="MoveNext" description="Iterates to the next resource in the list.">
+			<param name="HasNext" type="bool" pass="return" description="Iterates to the next resource in the list."/>
+		</method>
+		<method name="MovePrevious" description="Iterates to the previous resource in the list.">
+			<param name="HasPrevious" type="bool" pass="return" description="Iterates to the previous resource in the list."/>
+		</method>
+		<method name="GetCurrent" description="Returns the resource the iterator points at.">
+			<param name="CurrentInstance" type="handle" class="Base" pass="return" description="returns the resource instance."/>
+		</method>
+		<method name="Clone" description="Creates a new resource iterator with the same resource list.">
+			<param name="OutIterator" type="handle" class="Iterator" pass="return" description="returns the cloned Iterator instance"/>
+		</method>
+		<method name="Count" description="Returns the number of resoucres the iterator captures.">
+			<param name="Count" type="uint64" pass="return" description="returns the number of resources the iterator captures."/>
+		</method>
+	</class>
+
+
+
+	<class name="DataPackage" parent="Base">
+
+		<method name="GetRawPayload" description="Returns the raw payload.">
+			<param name="Payload" type="basicarray" class="uint8" pass="out" description="Raw payload data." />
+		</method>
+
+		<method name="Release" description="Releases memory of the data package.">
+		</method>
+		
+	</class>
+
+
+	<class name="PyroDataPackage" parent="DataPackage">
+
+
+	</class>
+
+	<class name="PyroDataPackageIterator" parent="Iterator">
+		<method name="GetCurrentPyroDataPackage" description="Returns the data package the iterator points at.">
+			<param name="CurrentInstance" type="handle" class="PyroDataPackage" pass="return" description="returns the data package instance."/>
+		</method>
+	</class>
+
+
+	<class name="OctDataPackage" parent="DataPackage">
+
+
+	</class>
+
+
+	<class name="OctDataPackageIterator" parent="Iterator">
+		<method name="GetCurrentOctDataPackage" description="Returns the data package the iterator points at.">
+			<param name="CurrentInstance" type="handle" class="OctDataPackage" pass="return" description="returns the data package instance."/>
+		</method>
+	</class>
+
+	<class name="RemoteFunctionCall" parent="Base">
+
+		<method name="GetFunctionName" description = "Returns function name">
+			<param name="FunctionName" type="string" pass="return" description="Function Name." />
+		</method>
+	
+		<method name="AddParameter" description = "Adds a function call parameter">
+			<param name="Parameter" type="string" pass="in" description="Parameter of the call." />
+		</method>
+	
+		<method name="Send" description = "Sends a remote function call over its connection.">
+			<param name="ResultString" type="string" pass="return" description="Returns result if successful." />
+		</method>
+	
+	</class>
+
+
+	<class name="Connection" parent="Base">
+	
+		<method name="Disconnect" description = "Disconnects and closes the connection">
+		</method>
+
+		<method name="SetRequestTimeout" description="Sets timeout value for each poll request below.">
+			<param name="Timeout" type="uint32" pass="in" description="Timeout in milliseconds. Default is 1000ms. Minimum 10ms, maximum 1000000ms." />
+		</method>
+
+		<method name="SetMaxErrorCount" description="Sets the maximum error messages that can be received before the connection is terminated.">
+			<param name="ErrorCount" type="uint32" pass="in" description="Max Error count. Default is 1024. Minimum 16, maximum 65535." />
+		</method>
+
+		<method name="SetMaxMemoryCount" description="Sets the maximum memory buffer the data packets can use before the connection is terminated.">
+			<param name="MaxMemoryCount" type="uint32" pass="in" description="Max memory count in bytes. Default is 1MB. Minimum 1kB, maximum 1GB." />
+		</method>
+
+		<method name="SetBufferFile" description="Sets a temporary filename to which the packets are buffered.">
+			<param name="FileName" type="string" pass="in" description="Filename which should be used as buffer." />
+			<param name="MaxMemoryCount" type="uint64" pass="in" description="Max memory count in bytes. Default is 1MB. Minimum 1kB, maximum 1TB." />
+		</method>
+
+		<method name="UnsetBufferFile" description="Stops writing to disk.">
+		</method>
+
+		<method name="SetCheckAliveInterval" description="Sets check alive interval. 0ms means no check alive request is sent.">
+			<param name="CheckAliveInterval" type="uint32" pass="in" description="Timeout in milliseconds. Default is 1000ms. Max value is 1000000ms." />
+		</method>
+	
+		<method name="RetrieveFirmwareVersion" description = "Retrieves Firmware Version. Fails if firmware is not existing.">
+			<param name="FirmwareName" type="string" pass="in" description="Name of the firmware to retrieve." />
+			<param name="FirmwareVersion" type="string" pass="out" description="Version of the requested firmware." />
+			<param name="Filename" type="string" pass="out" description="Filename of the requested firmware." />
+			<param name="Filedate" type="string" pass="out" description="Timestamp of the requested firmware in ISO8601 Time." />
+			<param name="SHA256" type="string" pass="out" description="Checksum of the requested firmware." />
+		</method>
+
+		<method name="UpdateFirmware" description = "Retrieves Firmware Version. Fails if firmware is not existing.">
+			<param name="FirmwareName" type="string" pass="in" description="Name of the new firmware." />
+			<param name="FirmwareVersion" type="string" pass="in" description="Version of the new firmware." />
+			<param name="FileName" type="string" pass="in" description="Filename of the new firmware." />
+			<param name="FileDate" type="string" pass="in" description="Timestamp of the requested firmware in ISO8601 Time." />
+			<param name="SHA256" type="string" pass="in" description="Checksum of the new firmware." />
+			<param name="BinaryData" type="basicarray" class="uint8" pass="in" description="Blob of new firmware." />
+		</method>
+
+		<method name="StartFirmware" description = "Starts firmware on Open Interface Extension.">
+			<param name="FileName" type="string" pass="in" description="Filename of the firmware to start." />
+			<param name="Success" type="bool" pass="return" description="Firmware successfully started." />
+		</method>
+
+		<method name="StopFirmware" description = "Stops firmware on Open Interface Extension.">
+			<param name="FileName" type="string" pass="in" description="Filename of the firmware to stop." />
+			<param name="Success" type="bool" pass="return" description="Firmware successfully stopped." />
+		</method>
+		
+		<method name="SetConnectionErrorCallback" description = "sets a callback that triggers when a connection error occured.">			
+			<param name="Callback" type="functiontype" class="ConnectionErrorCallback" pass="in" description="callback pointer." />
+		</method>
+
+		<method name="ClearErrors" description = "clears the error log.">			
+		</method>
+
+		<method name="GetErrorCount" description = "Returns the list of errors in the error log.">			
+			<param name="ErrorCount" type="uint32" pass="return" description="Errors in the error log." />
+		</method>
+
+		<method name="GetError" description = "Returns an error message of the error log">			
+			<param name="ErrorIndex" type="uint32" pass="in" description="Index of the error." />
+			<param name="ErrorMessage" type="string" pass="out" description="Message of the error." />
+			<param name="Timestamp" type="string" pass="out" description="ISO8601 Time when the error was reported." />
+		</method>
+
+		<method name="CreateRemoteFunctionCall" description="Creates a new remote function call.">			
+			<param name="FunctionName" type="string" pass="in" description="Function name." />
+			<param name="Instance" type="class" class="RemoteFunctionCall" pass="return" description="Function call instance." />			
+		</method>
+		
+		<method name="GetBufferedPyroPackages" description="Retrieves currently buffered pyro packages.">			
+			<param name="Iterator" type="class" class="PyroDataPackageIterator" pass="return" description="Iterator of buffered packages." />			
+		</method>
+		
+		<method name="GetBufferedOctPackages" description="Retrieves currently buffered oct packages.">			
+			<param name="Iterator" type="class" class="OctDataPackageIterator" pass="return" description="Iterator of buffered packages." />			
+		</method>
+		
+
+
+	</class>
+
+	<class name="ConnectionIterator" parent="Iterator">
+		<method name="GetCurrentConnection" description="Returns the connection the iterator points at.">
+			<param name="CurrentInstance" type="handle" class="Connection" pass="return" description="returns the connection instance."/>
+		</method>
+	</class>
+
+	<class name="Server" parent="Base">
+
+		<method name="Start" description = "starts listening for connections.">
+			<param name="IPAddress" type="string" pass="in" description="IP Address to run on" />
+			<param name="Port" type="uint32" pass="in" description="Port to run on" />
+			<param name="IPv6" type="bool" pass="in" description="flag if IPv6 should be used" />
+		</method>
+
+		<method name="Stop" description = "stops listening for connections and disconnects existing ones.">
+		</method>
+
+		<method name="CloseAllConnections" description = "disconnects all connections but does not stop listening.">			
+		</method>
+	
+		<method name="SetThreadCount" description = "sets the maximum thread count to use. Must be called before Start">
+			<param name="ThreadCount" type="uint32" pass="in" description="Thread count to use (must be larger than 4, default is 32)" />
+		</method>
+	
+		<method name="SetBufferSize" description = "sets the receive buffer size">
+			<param name="RCVBufferSize" type="uint32" pass="in" description="Receive buffer size to use in bytes (must be between 4kB and 1GB, default is 1MB)" />
+		</method>
+
+		<method name="AcceptDevice" description = "adds an accepted device">
+			<param name="DeviceName" type="string" pass="in" description="Device name to be accepted. Empty string means all devices." />
+			<param name="ApplicationName" type="string" pass="in" description="Application name to be accepted. Empty string means all applications." />
+			<param name="VersionName" type="string" pass="in" description="Version name to be accepted. Empty string means all versions." />
+			<param name="RuleID" type="uint32" pass="return" description="Returns identifier of acceptance rule." />
+		</method>
+
+		<method name="UnAcceptDevice" description = "removes an accepted">			
+			<param name="RuleID" type="uint32" pass="in" description="identifier of acceptance rule." />
+		</method>
+		
+		<method name="ClearAcceptedDevices" description = "clears all accepted device rules">			
+		</method>
+
+		<method name="ListConnections" description = "lists all open connections">			
+			<param name="ConnectionIteratorInstance" type="class" class="ConnectionIterator" pass="return" description="list of all open connections." />
+		</method>
+
+		<method name="SetConnectionAcceptedCallback" description = "sets a callback that triggers when a new connection was established.">			
+			<param name="Callback" type="functiontype" class="ConnectionAcceptedCallback" pass="in" description="callback pointer." />
+		</method>
+
+		<method name="SetConnectionRejectedCallback" description = "sets a callback that triggers when a new connection was rejected.">			
+			<param name="Callback" type="functiontype" class="ConnectionRejectedCallback" pass="in" description="callback pointer." />
+		</method>
+
+	</class>
+
+	
+
+		
+	<global baseclassname="Base" stringoutclassname="Base" releasemethod="ReleaseInstance" acquiremethod="AcquireInstance" versionmethod="GetVersion" errormethod="GetLastError" symbollookupmethod="GetSymbolLookupMethod">
+		
+		<method name="GetVersion" description = "retrieves the binary version of this library.">
+			<param name="Major" type="uint32" pass="out" description="returns the major version of this library" />
+			<param name="Minor" type="uint32" pass="out" description="returns the minor version of this library" />
+			<param name="Micro" type="uint32" pass="out" description="returns the micro version of this library" />
+		</method>
+		<method name="GetLastError" description="Returns the last error recorded on this object">
+			<param name="Instance" type="class" class="Base" pass="in" description="Instance Handle" />
+			<param name="ErrorMessage" type="string" pass="out" description="Message of the last error" />
+			<param name="HasError" type="bool" pass="return" description="Is there a last error to query" />
+		</method>
+		<method name="ReleaseInstance" description="Releases shared ownership of an Instance">
+			<param name="Instance" type="class" class="Base" pass="in" description="Instance Handle" />
+		</method>
+		<method name="AcquireInstance" description="Acquires shared ownership of an Instance">
+			<param name="Instance" type="class" class="Base" pass="in" description="Instance Handle" />
+		</method>
+		<method name="GetSymbolLookupMethod" description="Returns the address of the SymbolLookupMethod">
+			<param name="SymbolLookupMethod" type="pointer" pass="return" description="Address of the SymbolAddressMethod" />
+		</method>				
+		<method name="CreateServer" description="Creates a open interface extension server instance.">
+			<param name="Instance" type="class" class="Server" pass="return" description="New Server instance" />
+		</method>
+		
+	</global>
+	
+	
+</component>
+
diff --git a/Drivers/ScanLabOIE/ACT/generateInterfaces.bat b/Drivers/ScanLabOIE/ACT/generateInterfaces.bat
new file mode 100644
index 00000000..bcbbf18f
--- /dev/null
+++ b/Drivers/ScanLabOIE/ACT/generateInterfaces.bat
@@ -0,0 +1,4 @@
+..\..\..\ACT\act.exe LibMCDriver_ScanLabOIE.xml -bindings ..\Headers -interfaces ..\Interfaces -suppresssubcomponents -suppresslicense -suppressstub -suppressexamples
+..\..\..\ACT\act.exe LIBOIE.xml -bindings ..\LibOIE\Headers -interfaces ..\LibOIE\Interfaces -suppresssubcomponents -suppresslicense -suppressstub -suppressexamples
+
+pause
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/CMakeLists.txt b/Drivers/ScanLabOIE/CMakeLists.txt
new file mode 100644
index 00000000..f2d7f612
--- /dev/null
+++ b/Drivers/ScanLabOIE/CMakeLists.txt
@@ -0,0 +1,137 @@
+#[[++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+]]
+
+
+cmake_minimum_required(VERSION 3.5)
+
+##########################################################################################
+### Change the next line for making a new driver
+##########################################################################################
+
+set (DRIVERPROJECT ScanLabOIE)
+
+##########################################################################################
+### generic CMake boilerplate code
+##########################################################################################
+
+project(LibMCDriver_${DRIVERPROJECT})
+
+string(TOLOWER ${DRIVERPROJECT} DRIVERSUFFIX)
+string(TOUPPER ${DRIVERPROJECT} DRIVERSUFFIX_UPPER)
+
+set (DRIVERNAME libmcdriver_${DRIVERSUFFIX})
+
+set (EXPORTFLAG __LIBMCDRIVER_${DRIVERSUFFIX_UPPER}_EXPORTS)
+
+set (CMAKE_CXX_STANDARD 11)
+
+# The location of autogenerated interfaces
+set(CMAKE_CURRENT_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/HeadersDev/CppDynamic)
+set(CMAKE_CURRENT_AUTOGENERATED_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/InterfacesDev)
+set(CMAKE_CURRENT_OUTPUT_DIR ${PROJECT_BINARY_DIR}/../../Output)
+
+file(STRINGS ${PROJECT_BINARY_DIR}/../../githash.txt GLOBALGITHASH)
+message(STATUS "Global git hash: \"${GLOBALGITHASH}\"")
+
+
+file(GLOB LIBMCDRIVER_SRC
+	${CMAKE_CURRENT_SOURCE_DIR}/Interfaces/*.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/Implementation/*.cpp
+)
+
+add_library(${DRIVERNAME} SHARED ${LIBMCDRIVER_SRC})
+# Do not prefix the binary's name with "lib" on Unix systems:
+set_target_properties(${DRIVERNAME} PROPERTIES PREFIX "" IMPORT_PREFIX "" )
+# The following two properties are crucial to reduce the number of undesirably exported symbols
+set_target_properties(${DRIVERNAME} PROPERTIES CXX_VISIBILITY_PRESET hidden)
+set_target_properties(${DRIVERNAME} PROPERTIES VISIBILITY_INLINES_HIDDEN ON)
+# This makes sure symbols are exported
+target_compile_options(${DRIVERNAME} PRIVATE "-D${EXPORTFLAG}")
+target_compile_options(${DRIVERNAME} PRIVATE "-D__LIBMCDRIVER_EXPORTS")
+target_include_directories(${DRIVERNAME} PRIVATE ${CMAKE_CURRENT_AUTOGENERATED_DIR})
+target_include_directories(${DRIVERNAME} PRIVATE ${CMAKE_CURRENT_HEADER_DIR})
+target_include_directories(${DRIVERNAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Implementation)
+target_include_directories(${DRIVERNAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Interfaces)
+
+set_target_properties(${DRIVERNAME}
+    PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_OUTPUT_DIR}"
+    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_OUTPUT_DIR}"
+    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_OUTPUT_DIR}"
+	LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_OUTPUT_DIR}"
+	ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_OUTPUT_DIR}"
+	VS_DEBUGGER_COMMAND "${CMAKE_CURRENT_OUTPUT_DIR}/amc_server.exe"
+	VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_OUTPUT_DIR}"	
+	OUTPUT_NAME "${GLOBALGITHASH}_driver_${DRIVERSUFFIX}"	
+)
+
+
+##########################################################################################
+### Copy driver header files
+##########################################################################################
+
+file (GLOB headerfiles LIST_DIRECTORIES false "${CMAKE_CURRENT_SOURCE_DIR}/Headers/CppDynamic/*.h*")
+foreach(headerfile ${headerfiles})
+
+	get_filename_component(headerfilename ${headerfile} NAME)
+	
+	add_custom_command(
+        TARGET ${DRIVERNAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "copying ${headerfile}...")
+
+	add_custom_command(
+        TARGET ${DRIVERNAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+                ${headerfile}
+                ${CMAKE_CURRENT_BINARY_DIR}/../../DevPackage/Framework/HeadersDriver/CppDynamic/${headerfilename})
+				
+				
+endforeach()	
+
+
+##########################################################################################
+### Add custom code below
+##########################################################################################
+
+file(GLOB LIBOIE_SRC
+	${CMAKE_CURRENT_SOURCE_DIR}/LibOIE/*.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/Interfaces/liboie*.cpp
+)
+
+add_library(liboie SHARED ${LIBOIE_SRC})
+# Do not prefix the binary's name with "lib" on Unix systems:
+set_target_properties(liboie PROPERTIES PREFIX "" IMPORT_PREFIX "" )
+# The following two properties are crucial to reduce the number of undesirably exported symbols
+set_target_properties(liboie PROPERTIES CXX_VISIBILITY_PRESET hidden)
+set_target_properties(liboie PROPERTIES VISIBILITY_INLINES_HIDDEN ON)
+# This makes sure symbols are exported
+target_compile_options(liboie PRIVATE "-D__LIBOIE_EXPORTS")
+target_include_directories(liboie PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/LibOIE)
+target_include_directories(liboie PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Interfaces)
diff --git a/Drivers/ScanLabOIE/Headers/CppDynamic/libmcdriver_scanlaboie_abi.hpp b/Drivers/ScanLabOIE/Headers/CppDynamic/libmcdriver_scanlaboie_abi.hpp
new file mode 100644
index 00000000..925ccef8
--- /dev/null
+++ b/Drivers/ScanLabOIE/Headers/CppDynamic/libmcdriver_scanlaboie_abi.hpp
@@ -0,0 +1,197 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file in order to allow an easy
+ use of MC Driver ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDRIVER_SCANLABOIE_HEADER_CPP
+#define __LIBMCDRIVER_SCANLABOIE_HEADER_CPP
+
+#ifdef __LIBMCDRIVER_SCANLABOIE_EXPORTS
+#ifdef _WIN32
+#define LIBMCDRIVER_SCANLABOIE_DECLSPEC __declspec (dllexport)
+#else // _WIN32
+#define LIBMCDRIVER_SCANLABOIE_DECLSPEC __attribute__((visibility("default")))
+#endif // _WIN32
+#else // __LIBMCDRIVER_SCANLABOIE_EXPORTS
+#define LIBMCDRIVER_SCANLABOIE_DECLSPEC
+#endif // __LIBMCDRIVER_SCANLABOIE_EXPORTS
+
+#include "libmcdriver_scanlaboie_types.hpp"
+
+#include "libmcdriverenv_dynamic.hpp"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*************************************************************************************************************************
+ Class definition for Base
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for Driver
+**************************************************************************************************************************/
+
+/**
+* returns the name identifier of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_driver_getname(LibMCDriver_ScanLabOIE_Driver pDriver, const LibMCDriver_ScanLabOIE_uint32 nNameBufferSize, LibMCDriver_ScanLabOIE_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* returns the type identifier of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nTypeBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTypeBuffer -  buffer of Type of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_driver_gettype(LibMCDriver_ScanLabOIE_Driver pDriver, const LibMCDriver_ScanLabOIE_uint32 nTypeBufferSize, LibMCDriver_ScanLabOIE_uint32* pTypeNeededChars, char * pTypeBuffer);
+
+/**
+* returns the version identifiers of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[out] pMajor - Major version.
+* @param[out] pMinor - Minor version.
+* @param[out] pMicro - Micro version.
+* @param[in] nBuildBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBuildNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBuildBuffer -  buffer of Build identifier., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_driver_getversion(LibMCDriver_ScanLabOIE_Driver pDriver, LibMCDriver_ScanLabOIE_uint32 * pMajor, LibMCDriver_ScanLabOIE_uint32 * pMinor, LibMCDriver_ScanLabOIE_uint32 * pMicro, const LibMCDriver_ScanLabOIE_uint32 nBuildBufferSize, LibMCDriver_ScanLabOIE_uint32* pBuildNeededChars, char * pBuildBuffer);
+
+/**
+* returns the header information
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nNameSpaceBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameSpaceNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameSpaceBuffer -  buffer of NameSpace of the driver., may be NULL
+* @param[in] nBaseNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBaseNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBaseNameBuffer -  buffer of BaseName of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_driver_getheaderinformation(LibMCDriver_ScanLabOIE_Driver pDriver, const LibMCDriver_ScanLabOIE_uint32 nNameSpaceBufferSize, LibMCDriver_ScanLabOIE_uint32* pNameSpaceNeededChars, char * pNameSpaceBuffer, const LibMCDriver_ScanLabOIE_uint32 nBaseNameBufferSize, LibMCDriver_ScanLabOIE_uint32* pBaseNameNeededChars, char * pBaseNameBuffer);
+
+/*************************************************************************************************************************
+ Class definition for Driver_ScanLab_OIE
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Global functions
+**************************************************************************************************************************/
+
+/**
+* retrieves the binary version of this library.
+*
+* @param[out] pMajor - returns the major version of this library
+* @param[out] pMinor - returns the minor version of this library
+* @param[out] pMicro - returns the micro version of this library
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_getversion(LibMCDriver_ScanLabOIE_uint32 * pMajor, LibMCDriver_ScanLabOIE_uint32 * pMinor, LibMCDriver_ScanLabOIE_uint32 * pMicro);
+
+/**
+* Returns the last error recorded on this object
+*
+* @param[in] pInstance - Instance Handle
+* @param[in] nErrorMessageBufferSize - size of the buffer (including trailing 0)
+* @param[out] pErrorMessageNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pErrorMessageBuffer -  buffer of Message of the last error, may be NULL
+* @param[out] pHasError - Is there a last error to query
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_getlasterror(LibMCDriver_ScanLabOIE_Base pInstance, const LibMCDriver_ScanLabOIE_uint32 nErrorMessageBufferSize, LibMCDriver_ScanLabOIE_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError);
+
+/**
+* Releases shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_releaseinstance(LibMCDriver_ScanLabOIE_Base pInstance);
+
+/**
+* Acquires shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_acquireinstance(LibMCDriver_ScanLabOIE_Base pInstance);
+
+/**
+* Injects an imported component for usage within this component
+*
+* @param[in] pNameSpace - NameSpace of the injected component
+* @param[in] pSymbolAddressMethod - Address of the SymbolAddressMethod of the injected component
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_injectcomponent(const char * pNameSpace, LibMCDriver_ScanLabOIE_pvoid pSymbolAddressMethod);
+
+/**
+* Returns the address of the SymbolLookupMethod
+*
+* @param[out] pSymbolLookupMethod - Address of the SymbolAddressMethod
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_getsymbollookupmethod(LibMCDriver_ScanLabOIE_pvoid * pSymbolLookupMethod);
+
+/**
+* Creates a driver instance with a specific name.
+*
+* @param[in] pName - Name of driver to be created.
+* @param[in] pType - Type of driver to be created.
+* @param[in] pDriverEnvironment - Environment of this driver.
+* @param[out] pInstance - New Driver instance
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_createdriver(const char * pName, const char * pType, LibMCDriverEnv_DriverEnvironment pDriverEnvironment, LibMCDriver_ScanLabOIE_Driver * pInstance);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __LIBMCDRIVER_SCANLABOIE_HEADER_CPP
+
diff --git a/Drivers/ScanLabOIE/Headers/CppDynamic/libmcdriver_scanlaboie_dynamic.h b/Drivers/ScanLabOIE/Headers/CppDynamic/libmcdriver_scanlaboie_dynamic.h
new file mode 100644
index 00000000..805f6f3c
--- /dev/null
+++ b/Drivers/ScanLabOIE/Headers/CppDynamic/libmcdriver_scanlaboie_dynamic.h
@@ -0,0 +1,199 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file in order to allow an easy
+ use of MC Driver ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDRIVER_SCANLABOIE_DYNAMICHEADER_CPPTYPES
+#define __LIBMCDRIVER_SCANLABOIE_DYNAMICHEADER_CPPTYPES
+
+#include "libmcdriver_scanlaboie_types.hpp"
+
+#include "libmcdriverenv_types.hpp"
+
+
+/*************************************************************************************************************************
+ Class definition for Base
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for Driver
+**************************************************************************************************************************/
+
+/**
+* returns the name identifier of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_ScanLabOIEResult (*PLibMCDriver_ScanLabOIEDriver_GetNamePtr) (LibMCDriver_ScanLabOIE_Driver pDriver, const LibMCDriver_ScanLabOIE_uint32 nNameBufferSize, LibMCDriver_ScanLabOIE_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* returns the type identifier of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nTypeBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTypeBuffer -  buffer of Type of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_ScanLabOIEResult (*PLibMCDriver_ScanLabOIEDriver_GetTypePtr) (LibMCDriver_ScanLabOIE_Driver pDriver, const LibMCDriver_ScanLabOIE_uint32 nTypeBufferSize, LibMCDriver_ScanLabOIE_uint32* pTypeNeededChars, char * pTypeBuffer);
+
+/**
+* returns the version identifiers of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[out] pMajor - Major version.
+* @param[out] pMinor - Minor version.
+* @param[out] pMicro - Micro version.
+* @param[in] nBuildBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBuildNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBuildBuffer -  buffer of Build identifier., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_ScanLabOIEResult (*PLibMCDriver_ScanLabOIEDriver_GetVersionPtr) (LibMCDriver_ScanLabOIE_Driver pDriver, LibMCDriver_ScanLabOIE_uint32 * pMajor, LibMCDriver_ScanLabOIE_uint32 * pMinor, LibMCDriver_ScanLabOIE_uint32 * pMicro, const LibMCDriver_ScanLabOIE_uint32 nBuildBufferSize, LibMCDriver_ScanLabOIE_uint32* pBuildNeededChars, char * pBuildBuffer);
+
+/**
+* returns the header information
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nNameSpaceBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameSpaceNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameSpaceBuffer -  buffer of NameSpace of the driver., may be NULL
+* @param[in] nBaseNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBaseNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBaseNameBuffer -  buffer of BaseName of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_ScanLabOIEResult (*PLibMCDriver_ScanLabOIEDriver_GetHeaderInformationPtr) (LibMCDriver_ScanLabOIE_Driver pDriver, const LibMCDriver_ScanLabOIE_uint32 nNameSpaceBufferSize, LibMCDriver_ScanLabOIE_uint32* pNameSpaceNeededChars, char * pNameSpaceBuffer, const LibMCDriver_ScanLabOIE_uint32 nBaseNameBufferSize, LibMCDriver_ScanLabOIE_uint32* pBaseNameNeededChars, char * pBaseNameBuffer);
+
+/*************************************************************************************************************************
+ Class definition for Driver_ScanLab_OIE
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Global functions
+**************************************************************************************************************************/
+
+/**
+* retrieves the binary version of this library.
+*
+* @param[out] pMajor - returns the major version of this library
+* @param[out] pMinor - returns the minor version of this library
+* @param[out] pMicro - returns the micro version of this library
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_ScanLabOIEResult (*PLibMCDriver_ScanLabOIEGetVersionPtr) (LibMCDriver_ScanLabOIE_uint32 * pMajor, LibMCDriver_ScanLabOIE_uint32 * pMinor, LibMCDriver_ScanLabOIE_uint32 * pMicro);
+
+/**
+* Returns the last error recorded on this object
+*
+* @param[in] pInstance - Instance Handle
+* @param[in] nErrorMessageBufferSize - size of the buffer (including trailing 0)
+* @param[out] pErrorMessageNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pErrorMessageBuffer -  buffer of Message of the last error, may be NULL
+* @param[out] pHasError - Is there a last error to query
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_ScanLabOIEResult (*PLibMCDriver_ScanLabOIEGetLastErrorPtr) (LibMCDriver_ScanLabOIE_Base pInstance, const LibMCDriver_ScanLabOIE_uint32 nErrorMessageBufferSize, LibMCDriver_ScanLabOIE_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError);
+
+/**
+* Releases shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_ScanLabOIEResult (*PLibMCDriver_ScanLabOIEReleaseInstancePtr) (LibMCDriver_ScanLabOIE_Base pInstance);
+
+/**
+* Acquires shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_ScanLabOIEResult (*PLibMCDriver_ScanLabOIEAcquireInstancePtr) (LibMCDriver_ScanLabOIE_Base pInstance);
+
+/**
+* Injects an imported component for usage within this component
+*
+* @param[in] pNameSpace - NameSpace of the injected component
+* @param[in] pSymbolAddressMethod - Address of the SymbolAddressMethod of the injected component
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_ScanLabOIEResult (*PLibMCDriver_ScanLabOIEInjectComponentPtr) (const char * pNameSpace, LibMCDriver_ScanLabOIE_pvoid pSymbolAddressMethod);
+
+/**
+* Returns the address of the SymbolLookupMethod
+*
+* @param[out] pSymbolLookupMethod - Address of the SymbolAddressMethod
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_ScanLabOIEResult (*PLibMCDriver_ScanLabOIEGetSymbolLookupMethodPtr) (LibMCDriver_ScanLabOIE_pvoid * pSymbolLookupMethod);
+
+/**
+* Creates a driver instance with a specific name.
+*
+* @param[in] pName - Name of driver to be created.
+* @param[in] pType - Type of driver to be created.
+* @param[in] pDriverEnvironment - Environment of this driver.
+* @param[out] pInstance - New Driver instance
+* @return error code or 0 (success)
+*/
+typedef LibMCDriver_ScanLabOIEResult (*PLibMCDriver_ScanLabOIECreateDriverPtr) (const char * pName, const char * pType, LibMCDriverEnv_DriverEnvironment pDriverEnvironment, LibMCDriver_ScanLabOIE_Driver * pInstance);
+
+/*************************************************************************************************************************
+ Function Table Structure
+**************************************************************************************************************************/
+
+typedef struct {
+	void * m_LibraryHandle;
+	PLibMCDriver_ScanLabOIEDriver_GetNamePtr m_Driver_GetName;
+	PLibMCDriver_ScanLabOIEDriver_GetTypePtr m_Driver_GetType;
+	PLibMCDriver_ScanLabOIEDriver_GetVersionPtr m_Driver_GetVersion;
+	PLibMCDriver_ScanLabOIEDriver_GetHeaderInformationPtr m_Driver_GetHeaderInformation;
+	PLibMCDriver_ScanLabOIEGetVersionPtr m_GetVersion;
+	PLibMCDriver_ScanLabOIEGetLastErrorPtr m_GetLastError;
+	PLibMCDriver_ScanLabOIEReleaseInstancePtr m_ReleaseInstance;
+	PLibMCDriver_ScanLabOIEAcquireInstancePtr m_AcquireInstance;
+	PLibMCDriver_ScanLabOIEInjectComponentPtr m_InjectComponent;
+	PLibMCDriver_ScanLabOIEGetSymbolLookupMethodPtr m_GetSymbolLookupMethod;
+	PLibMCDriver_ScanLabOIECreateDriverPtr m_CreateDriver;
+} sLibMCDriver_ScanLabOIEDynamicWrapperTable;
+
+#endif // __LIBMCDRIVER_SCANLABOIE_DYNAMICHEADER_CPPTYPES
+
diff --git a/Drivers/ScanLabOIE/Headers/CppDynamic/libmcdriver_scanlaboie_dynamic.hpp b/Drivers/ScanLabOIE/Headers/CppDynamic/libmcdriver_scanlaboie_dynamic.hpp
new file mode 100644
index 00000000..a2e9ba82
--- /dev/null
+++ b/Drivers/ScanLabOIE/Headers/CppDynamic/libmcdriver_scanlaboie_dynamic.hpp
@@ -0,0 +1,790 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file in order to allow an easy
+ use of MC Driver ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDRIVER_SCANLABOIE_CPPHEADER_DYNAMIC_CPP
+#define __LIBMCDRIVER_SCANLABOIE_CPPHEADER_DYNAMIC_CPP
+
+#include "libmcdriver_scanlaboie_types.hpp"
+#include "libmcdriver_scanlaboie_dynamic.h"
+
+#include "libmcdriverenv_dynamic.hpp"
+
+#ifdef _WIN32
+#include <windows.h>
+#else // _WIN32
+#include <dlfcn.h>
+#endif // _WIN32
+#include <string>
+#include <memory>
+#include <vector>
+#include <exception>
+
+namespace LibMCDriver_ScanLabOIE {
+
+/*************************************************************************************************************************
+ Forward Declaration of all classes
+**************************************************************************************************************************/
+class CWrapper;
+class CBase;
+class CDriver;
+class CDriver_ScanLab_OIE;
+
+/*************************************************************************************************************************
+ Declaration of deprecated class types
+**************************************************************************************************************************/
+typedef CWrapper CLibMCDriver_ScanLabOIEWrapper;
+typedef CBase CLibMCDriver_ScanLabOIEBase;
+typedef CDriver CLibMCDriver_ScanLabOIEDriver;
+typedef CDriver_ScanLab_OIE CLibMCDriver_ScanLabOIEDriver_ScanLab_OIE;
+
+/*************************************************************************************************************************
+ Declaration of shared pointer types
+**************************************************************************************************************************/
+typedef std::shared_ptr<CWrapper> PWrapper;
+typedef std::shared_ptr<CBase> PBase;
+typedef std::shared_ptr<CDriver> PDriver;
+typedef std::shared_ptr<CDriver_ScanLab_OIE> PDriver_ScanLab_OIE;
+
+/*************************************************************************************************************************
+ Declaration of deprecated shared pointer types
+**************************************************************************************************************************/
+typedef PWrapper PLibMCDriver_ScanLabOIEWrapper;
+typedef PBase PLibMCDriver_ScanLabOIEBase;
+typedef PDriver PLibMCDriver_ScanLabOIEDriver;
+typedef PDriver_ScanLab_OIE PLibMCDriver_ScanLabOIEDriver_ScanLab_OIE;
+
+
+/*************************************************************************************************************************
+ classParam Definition
+**************************************************************************************************************************/
+
+template<class T> class classParam {
+private:
+	const T* m_ptr;
+
+public:
+	classParam(const T* ptr)
+		: m_ptr (ptr)
+	{
+	}
+
+	classParam(std::shared_ptr <T> sharedPtr)
+		: m_ptr (sharedPtr.get())
+	{
+	}
+
+	LibMCDriver_ScanLabOIEHandle GetHandle()
+	{
+		if (m_ptr != nullptr)
+			return m_ptr->handle();
+		return nullptr;
+	}
+};
+
+/*************************************************************************************************************************
+ Class ELibMCDriver_ScanLabOIEException 
+**************************************************************************************************************************/
+class ELibMCDriver_ScanLabOIEException : public std::exception {
+protected:
+	/**
+	* Error code for the Exception.
+	*/
+	LibMCDriver_ScanLabOIEResult m_errorCode;
+	/**
+	* Error message for the Exception.
+	*/
+	std::string m_errorMessage;
+
+public:
+	/**
+	* Exception Constructor.
+	*/
+	ELibMCDriver_ScanLabOIEException(LibMCDriver_ScanLabOIEResult errorCode, const std::string & sErrorMessage)
+		: m_errorMessage("LibMCDriver_ScanLabOIE Error " + std::to_string(errorCode) + " (" + sErrorMessage + ")")
+	{
+		m_errorCode = errorCode;
+	}
+
+	/**
+	* Returns error code
+	*/
+	LibMCDriver_ScanLabOIEResult getErrorCode() const noexcept
+	{
+		return m_errorCode;
+	}
+
+	/**
+	* Returns error message
+	*/
+	const char* what() const noexcept
+	{
+		return m_errorMessage.c_str();
+	}
+
+};
+
+/*************************************************************************************************************************
+ Class CInputVector
+**************************************************************************************************************************/
+template <typename T>
+class CInputVector {
+private:
+	
+	const T* m_data;
+	size_t m_size;
+	
+public:
+	
+	CInputVector( const std::vector<T>& vec)
+		: m_data( vec.data() ), m_size( vec.size() )
+	{
+	}
+	
+	CInputVector( const T* in_data, size_t in_size)
+		: m_data( in_data ), m_size(in_size )
+	{
+	}
+	
+	const T* data() const
+	{
+		return m_data;
+	}
+	
+	size_t size() const
+	{
+		return m_size;
+	}
+	
+};
+
+// declare deprecated class name
+template<typename T>
+using CLibMCDriver_ScanLabOIEInputVector = CInputVector<T>;
+
+/*************************************************************************************************************************
+ Class CWrapper 
+**************************************************************************************************************************/
+class CWrapper {
+public:
+	
+	CWrapper(void* pSymbolLookupMethod)
+	{
+		CheckError(nullptr, initWrapperTable(&m_WrapperTable));
+		CheckError(nullptr, loadWrapperTableFromSymbolLookupMethod(&m_WrapperTable, pSymbolLookupMethod));
+		
+		CheckError(nullptr, checkBinaryVersion());
+	}
+	
+	CWrapper(const std::string &sFileName)
+	{
+		CheckError(nullptr, initWrapperTable(&m_WrapperTable));
+		CheckError(nullptr, loadWrapperTable(&m_WrapperTable, sFileName.c_str()));
+		
+		CheckError(nullptr, checkBinaryVersion());
+	}
+	
+	static PWrapper loadLibrary(const std::string &sFileName)
+	{
+		return std::make_shared<CWrapper>(sFileName);
+	}
+	
+	static PWrapper loadLibraryFromSymbolLookupMethod(void* pSymbolLookupMethod)
+	{
+		return std::make_shared<CWrapper>(pSymbolLookupMethod);
+	}
+	
+	~CWrapper()
+	{
+		releaseWrapperTable(&m_WrapperTable);
+	}
+	
+	inline void CheckError(CBase * pBaseClass, LibMCDriver_ScanLabOIEResult nResult);
+
+	inline void GetVersion(LibMCDriver_ScanLabOIE_uint32 & nMajor, LibMCDriver_ScanLabOIE_uint32 & nMinor, LibMCDriver_ScanLabOIE_uint32 & nMicro);
+	inline bool GetLastError(classParam<CBase> pInstance, std::string & sErrorMessage);
+	inline void ReleaseInstance(classParam<CBase> pInstance);
+	inline void AcquireInstance(classParam<CBase> pInstance);
+	inline void InjectComponent(const std::string & sNameSpace, const LibMCDriver_ScanLabOIE_pvoid pSymbolAddressMethod);
+	inline LibMCDriver_ScanLabOIE_pvoid GetSymbolLookupMethod();
+	inline PDriver CreateDriver(const std::string & sName, const std::string & sType, classParam<LibMCDriverEnv::CDriverEnvironment> pDriverEnvironment);
+
+private:
+	sLibMCDriver_ScanLabOIEDynamicWrapperTable m_WrapperTable;
+	// Injected Components
+	LibMCDriverEnv::PWrapper m_pLibMCDriverEnvWrapper;
+
+	
+	LibMCDriver_ScanLabOIEResult checkBinaryVersion()
+	{
+		LibMCDriver_ScanLabOIE_uint32 nMajor, nMinor, nMicro;
+		GetVersion(nMajor, nMinor, nMicro);
+		if ( (nMajor != LIBMCDRIVER_SCANLABOIE_VERSION_MAJOR) || (nMinor < LIBMCDRIVER_SCANLABOIE_VERSION_MINOR) ) {
+			return LIBMCDRIVER_SCANLABOIE_ERROR_INCOMPATIBLEBINARYVERSION;
+		}
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+	LibMCDriver_ScanLabOIEResult initWrapperTable(sLibMCDriver_ScanLabOIEDynamicWrapperTable * pWrapperTable);
+	LibMCDriver_ScanLabOIEResult releaseWrapperTable(sLibMCDriver_ScanLabOIEDynamicWrapperTable * pWrapperTable);
+	LibMCDriver_ScanLabOIEResult loadWrapperTable(sLibMCDriver_ScanLabOIEDynamicWrapperTable * pWrapperTable, const char * pLibraryFileName);
+	LibMCDriver_ScanLabOIEResult loadWrapperTableFromSymbolLookupMethod(sLibMCDriver_ScanLabOIEDynamicWrapperTable * pWrapperTable, void* pSymbolLookupMethod);
+
+	friend class CBase;
+	friend class CDriver;
+	friend class CDriver_ScanLab_OIE;
+
+};
+
+	
+/*************************************************************************************************************************
+ Class CBase 
+**************************************************************************************************************************/
+class CBase {
+public:
+	
+protected:
+	/* Wrapper Object that created the class. */
+	CWrapper * m_pWrapper;
+	/* Handle to Instance in library*/
+	LibMCDriver_ScanLabOIEHandle m_pHandle;
+
+	/* Checks for an Error code and raises Exceptions */
+	void CheckError(LibMCDriver_ScanLabOIEResult nResult)
+	{
+		if (m_pWrapper != nullptr)
+			m_pWrapper->CheckError(this, nResult);
+	}
+public:
+	/**
+	* CBase::CBase - Constructor for Base class.
+	*/
+	CBase(CWrapper * pWrapper, LibMCDriver_ScanLabOIEHandle pHandle)
+		: m_pWrapper(pWrapper), m_pHandle(pHandle)
+	{
+	}
+
+	/**
+	* CBase::~CBase - Destructor for Base class.
+	*/
+	virtual ~CBase()
+	{
+		if (m_pWrapper != nullptr)
+			m_pWrapper->ReleaseInstance(this);
+		m_pWrapper = nullptr;
+	}
+
+	/**
+	* CBase::handle - Returns handle to instance.
+	*/
+	LibMCDriver_ScanLabOIEHandle handle() const
+	{
+		return m_pHandle;
+	}
+
+	/**
+	* CBase::wrapper - Returns wrapper instance.
+	*/
+	CWrapper * wrapper() const
+	{
+		return m_pWrapper;
+	}
+	
+	friend class CWrapper;
+};
+	
+/*************************************************************************************************************************
+ Class CDriver 
+**************************************************************************************************************************/
+class CDriver : public CBase {
+public:
+	
+	/**
+	* CDriver::CDriver - Constructor for Driver class.
+	*/
+	CDriver(CWrapper* pWrapper, LibMCDriver_ScanLabOIEHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline std::string GetName();
+	inline std::string GetType();
+	inline void GetVersion(LibMCDriver_ScanLabOIE_uint32 & nMajor, LibMCDriver_ScanLabOIE_uint32 & nMinor, LibMCDriver_ScanLabOIE_uint32 & nMicro, std::string & sBuild);
+	inline void GetHeaderInformation(std::string & sNameSpace, std::string & sBaseName);
+};
+	
+/*************************************************************************************************************************
+ Class CDriver_ScanLab_OIE 
+**************************************************************************************************************************/
+class CDriver_ScanLab_OIE : public CDriver {
+public:
+	
+	/**
+	* CDriver_ScanLab_OIE::CDriver_ScanLab_OIE - Constructor for Driver_ScanLab_OIE class.
+	*/
+	CDriver_ScanLab_OIE(CWrapper* pWrapper, LibMCDriver_ScanLabOIEHandle pHandle)
+		: CDriver(pWrapper, pHandle)
+	{
+	}
+	
+};
+	
+	/**
+	* CWrapper::GetVersion - retrieves the binary version of this library.
+	* @param[out] nMajor - returns the major version of this library
+	* @param[out] nMinor - returns the minor version of this library
+	* @param[out] nMicro - returns the micro version of this library
+	*/
+	inline void CWrapper::GetVersion(LibMCDriver_ScanLabOIE_uint32 & nMajor, LibMCDriver_ScanLabOIE_uint32 & nMinor, LibMCDriver_ScanLabOIE_uint32 & nMicro)
+	{
+		CheckError(nullptr,m_WrapperTable.m_GetVersion(&nMajor, &nMinor, &nMicro));
+	}
+	
+	/**
+	* CWrapper::GetLastError - Returns the last error recorded on this object
+	* @param[in] pInstance - Instance Handle
+	* @param[out] sErrorMessage - Message of the last error
+	* @return Is there a last error to query
+	*/
+	inline bool CWrapper::GetLastError(classParam<CBase> pInstance, std::string & sErrorMessage)
+	{
+		LibMCDriver_ScanLabOIEHandle hInstance = pInstance.GetHandle();
+		LibMCDriver_ScanLabOIE_uint32 bytesNeededErrorMessage = 0;
+		LibMCDriver_ScanLabOIE_uint32 bytesWrittenErrorMessage = 0;
+		bool resultHasError = 0;
+		CheckError(nullptr,m_WrapperTable.m_GetLastError(hInstance, 0, &bytesNeededErrorMessage, nullptr, &resultHasError));
+		std::vector<char> bufferErrorMessage(bytesNeededErrorMessage);
+		CheckError(nullptr,m_WrapperTable.m_GetLastError(hInstance, bytesNeededErrorMessage, &bytesWrittenErrorMessage, &bufferErrorMessage[0], &resultHasError));
+		sErrorMessage = std::string(&bufferErrorMessage[0]);
+		
+		return resultHasError;
+	}
+	
+	/**
+	* CWrapper::ReleaseInstance - Releases shared ownership of an Instance
+	* @param[in] pInstance - Instance Handle
+	*/
+	inline void CWrapper::ReleaseInstance(classParam<CBase> pInstance)
+	{
+		LibMCDriver_ScanLabOIEHandle hInstance = pInstance.GetHandle();
+		CheckError(nullptr,m_WrapperTable.m_ReleaseInstance(hInstance));
+	}
+	
+	/**
+	* CWrapper::AcquireInstance - Acquires shared ownership of an Instance
+	* @param[in] pInstance - Instance Handle
+	*/
+	inline void CWrapper::AcquireInstance(classParam<CBase> pInstance)
+	{
+		LibMCDriver_ScanLabOIEHandle hInstance = pInstance.GetHandle();
+		CheckError(nullptr,m_WrapperTable.m_AcquireInstance(hInstance));
+	}
+	
+	/**
+	* CWrapper::InjectComponent - Injects an imported component for usage within this component
+	* @param[in] sNameSpace - NameSpace of the injected component
+	* @param[in] pSymbolAddressMethod - Address of the SymbolAddressMethod of the injected component
+	*/
+	inline void CWrapper::InjectComponent(const std::string & sNameSpace, const LibMCDriver_ScanLabOIE_pvoid pSymbolAddressMethod)
+	{
+		CheckError(nullptr,m_WrapperTable.m_InjectComponent(sNameSpace.c_str(), pSymbolAddressMethod));
+		
+		bool bNameSpaceFound = false;
+		if (sNameSpace == "LibMCDriverEnv") {
+			if (m_pLibMCDriverEnvWrapper != nullptr) {
+				throw ELibMCDriver_ScanLabOIEException(LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTLOADLIBRARY, "Library with namespace " + sNameSpace + " is already registered.");
+			}
+			m_pLibMCDriverEnvWrapper = LibMCDriverEnv::CWrapper::loadLibraryFromSymbolLookupMethod(pSymbolAddressMethod);
+			bNameSpaceFound = true;
+		}
+		if (!bNameSpaceFound)
+			throw ELibMCDriver_ScanLabOIEException(LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTLOADLIBRARY, "Unknown namespace " + sNameSpace);
+	}
+	
+	/**
+	* CWrapper::GetSymbolLookupMethod - Returns the address of the SymbolLookupMethod
+	* @return Address of the SymbolAddressMethod
+	*/
+	inline LibMCDriver_ScanLabOIE_pvoid CWrapper::GetSymbolLookupMethod()
+	{
+		LibMCDriver_ScanLabOIE_pvoid resultSymbolLookupMethod = 0;
+		CheckError(nullptr,m_WrapperTable.m_GetSymbolLookupMethod(&resultSymbolLookupMethod));
+		
+		return resultSymbolLookupMethod;
+	}
+	
+	/**
+	* CWrapper::CreateDriver - Creates a driver instance with a specific name.
+	* @param[in] sName - Name of driver to be created.
+	* @param[in] sType - Type of driver to be created.
+	* @param[in] pDriverEnvironment - Environment of this driver.
+	* @return New Driver instance
+	*/
+	inline PDriver CWrapper::CreateDriver(const std::string & sName, const std::string & sType, classParam<LibMCDriverEnv::CDriverEnvironment> pDriverEnvironment)
+	{
+		LibMCDriverEnvHandle hDriverEnvironment = pDriverEnvironment.GetHandle();
+		LibMCDriver_ScanLabOIEHandle hInstance = nullptr;
+		CheckError(nullptr,m_WrapperTable.m_CreateDriver(sName.c_str(), sType.c_str(), hDriverEnvironment, &hInstance));
+		
+		if (!hInstance) {
+			CheckError(nullptr,LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CDriver>(this, hInstance);
+	}
+	
+	inline void CWrapper::CheckError(CBase * pBaseClass, LibMCDriver_ScanLabOIEResult nResult)
+	{
+		if (nResult != 0) {
+			std::string sErrorMessage;
+			if (pBaseClass != nullptr) {
+				GetLastError(pBaseClass, sErrorMessage);
+			}
+			throw ELibMCDriver_ScanLabOIEException(nResult, sErrorMessage);
+		}
+	}
+	
+
+	inline LibMCDriver_ScanLabOIEResult CWrapper::initWrapperTable(sLibMCDriver_ScanLabOIEDynamicWrapperTable * pWrapperTable)
+	{
+		if (pWrapperTable == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM;
+		
+		pWrapperTable->m_LibraryHandle = nullptr;
+		pWrapperTable->m_Driver_GetName = nullptr;
+		pWrapperTable->m_Driver_GetType = nullptr;
+		pWrapperTable->m_Driver_GetVersion = nullptr;
+		pWrapperTable->m_Driver_GetHeaderInformation = nullptr;
+		pWrapperTable->m_GetVersion = nullptr;
+		pWrapperTable->m_GetLastError = nullptr;
+		pWrapperTable->m_ReleaseInstance = nullptr;
+		pWrapperTable->m_AcquireInstance = nullptr;
+		pWrapperTable->m_InjectComponent = nullptr;
+		pWrapperTable->m_GetSymbolLookupMethod = nullptr;
+		pWrapperTable->m_CreateDriver = nullptr;
+		
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+
+	inline LibMCDriver_ScanLabOIEResult CWrapper::releaseWrapperTable(sLibMCDriver_ScanLabOIEDynamicWrapperTable * pWrapperTable)
+	{
+		if (pWrapperTable == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM;
+		
+		if (pWrapperTable->m_LibraryHandle != nullptr) {
+		#ifdef _WIN32
+			HMODULE hModule = (HMODULE) pWrapperTable->m_LibraryHandle;
+			FreeLibrary(hModule);
+		#else // _WIN32
+			dlclose(pWrapperTable->m_LibraryHandle);
+		#endif // _WIN32
+			return initWrapperTable(pWrapperTable);
+		}
+		
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+
+	inline LibMCDriver_ScanLabOIEResult CWrapper::loadWrapperTable(sLibMCDriver_ScanLabOIEDynamicWrapperTable * pWrapperTable, const char * pLibraryFileName)
+	{
+		if (pWrapperTable == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM;
+		if (pLibraryFileName == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM;
+		
+		#ifdef _WIN32
+		// Convert filename to UTF16-string
+		int nLength = (int)strlen(pLibraryFileName);
+		int nBufferSize = nLength * 2 + 2;
+		std::vector<wchar_t> wsLibraryFileName(nBufferSize);
+		int nResult = MultiByteToWideChar(CP_UTF8, 0, pLibraryFileName, nLength, &wsLibraryFileName[0], nBufferSize);
+		if (nResult == 0)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTLOADLIBRARY;
+		
+		HMODULE hLibrary = LoadLibraryW(wsLibraryFileName.data());
+		if (hLibrary == 0) 
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTLOADLIBRARY;
+		#else // _WIN32
+		void* hLibrary = dlopen(pLibraryFileName, RTLD_LAZY);
+		if (hLibrary == 0) 
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTLOADLIBRARY;
+		dlerror();
+		#endif // _WIN32
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_GetName = (PLibMCDriver_ScanLabOIEDriver_GetNamePtr) GetProcAddress(hLibrary, "libmcdriver_scanlaboie_driver_getname");
+		#else // _WIN32
+		pWrapperTable->m_Driver_GetName = (PLibMCDriver_ScanLabOIEDriver_GetNamePtr) dlsym(hLibrary, "libmcdriver_scanlaboie_driver_getname");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_GetName == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_GetType = (PLibMCDriver_ScanLabOIEDriver_GetTypePtr) GetProcAddress(hLibrary, "libmcdriver_scanlaboie_driver_gettype");
+		#else // _WIN32
+		pWrapperTable->m_Driver_GetType = (PLibMCDriver_ScanLabOIEDriver_GetTypePtr) dlsym(hLibrary, "libmcdriver_scanlaboie_driver_gettype");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_GetType == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_GetVersion = (PLibMCDriver_ScanLabOIEDriver_GetVersionPtr) GetProcAddress(hLibrary, "libmcdriver_scanlaboie_driver_getversion");
+		#else // _WIN32
+		pWrapperTable->m_Driver_GetVersion = (PLibMCDriver_ScanLabOIEDriver_GetVersionPtr) dlsym(hLibrary, "libmcdriver_scanlaboie_driver_getversion");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_GetVersion == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Driver_GetHeaderInformation = (PLibMCDriver_ScanLabOIEDriver_GetHeaderInformationPtr) GetProcAddress(hLibrary, "libmcdriver_scanlaboie_driver_getheaderinformation");
+		#else // _WIN32
+		pWrapperTable->m_Driver_GetHeaderInformation = (PLibMCDriver_ScanLabOIEDriver_GetHeaderInformationPtr) dlsym(hLibrary, "libmcdriver_scanlaboie_driver_getheaderinformation");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Driver_GetHeaderInformation == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_GetVersion = (PLibMCDriver_ScanLabOIEGetVersionPtr) GetProcAddress(hLibrary, "libmcdriver_scanlaboie_getversion");
+		#else // _WIN32
+		pWrapperTable->m_GetVersion = (PLibMCDriver_ScanLabOIEGetVersionPtr) dlsym(hLibrary, "libmcdriver_scanlaboie_getversion");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_GetVersion == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_GetLastError = (PLibMCDriver_ScanLabOIEGetLastErrorPtr) GetProcAddress(hLibrary, "libmcdriver_scanlaboie_getlasterror");
+		#else // _WIN32
+		pWrapperTable->m_GetLastError = (PLibMCDriver_ScanLabOIEGetLastErrorPtr) dlsym(hLibrary, "libmcdriver_scanlaboie_getlasterror");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_GetLastError == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_ReleaseInstance = (PLibMCDriver_ScanLabOIEReleaseInstancePtr) GetProcAddress(hLibrary, "libmcdriver_scanlaboie_releaseinstance");
+		#else // _WIN32
+		pWrapperTable->m_ReleaseInstance = (PLibMCDriver_ScanLabOIEReleaseInstancePtr) dlsym(hLibrary, "libmcdriver_scanlaboie_releaseinstance");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_ReleaseInstance == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_AcquireInstance = (PLibMCDriver_ScanLabOIEAcquireInstancePtr) GetProcAddress(hLibrary, "libmcdriver_scanlaboie_acquireinstance");
+		#else // _WIN32
+		pWrapperTable->m_AcquireInstance = (PLibMCDriver_ScanLabOIEAcquireInstancePtr) dlsym(hLibrary, "libmcdriver_scanlaboie_acquireinstance");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_AcquireInstance == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_InjectComponent = (PLibMCDriver_ScanLabOIEInjectComponentPtr) GetProcAddress(hLibrary, "libmcdriver_scanlaboie_injectcomponent");
+		#else // _WIN32
+		pWrapperTable->m_InjectComponent = (PLibMCDriver_ScanLabOIEInjectComponentPtr) dlsym(hLibrary, "libmcdriver_scanlaboie_injectcomponent");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_InjectComponent == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_GetSymbolLookupMethod = (PLibMCDriver_ScanLabOIEGetSymbolLookupMethodPtr) GetProcAddress(hLibrary, "libmcdriver_scanlaboie_getsymbollookupmethod");
+		#else // _WIN32
+		pWrapperTable->m_GetSymbolLookupMethod = (PLibMCDriver_ScanLabOIEGetSymbolLookupMethodPtr) dlsym(hLibrary, "libmcdriver_scanlaboie_getsymbollookupmethod");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_GetSymbolLookupMethod == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_CreateDriver = (PLibMCDriver_ScanLabOIECreateDriverPtr) GetProcAddress(hLibrary, "libmcdriver_scanlaboie_createdriver");
+		#else // _WIN32
+		pWrapperTable->m_CreateDriver = (PLibMCDriver_ScanLabOIECreateDriverPtr) dlsym(hLibrary, "libmcdriver_scanlaboie_createdriver");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_CreateDriver == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		pWrapperTable->m_LibraryHandle = hLibrary;
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+
+	inline LibMCDriver_ScanLabOIEResult CWrapper::loadWrapperTableFromSymbolLookupMethod(sLibMCDriver_ScanLabOIEDynamicWrapperTable * pWrapperTable, void* pSymbolLookupMethod)
+{
+		if (pWrapperTable == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM;
+		if (pSymbolLookupMethod == nullptr)
+			return LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM;
+		
+		typedef LibMCDriver_ScanLabOIEResult(*SymbolLookupType)(const char*, void**);
+		
+		SymbolLookupType pLookup = (SymbolLookupType)pSymbolLookupMethod;
+		
+		LibMCDriver_ScanLabOIEResult eLookupError = LIBMCDRIVER_SCANLABOIE_SUCCESS;
+		eLookupError = (*pLookup)("libmcdriver_scanlaboie_driver_getname", (void**)&(pWrapperTable->m_Driver_GetName));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_GetName == nullptr) )
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_scanlaboie_driver_gettype", (void**)&(pWrapperTable->m_Driver_GetType));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_GetType == nullptr) )
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_scanlaboie_driver_getversion", (void**)&(pWrapperTable->m_Driver_GetVersion));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_GetVersion == nullptr) )
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_scanlaboie_driver_getheaderinformation", (void**)&(pWrapperTable->m_Driver_GetHeaderInformation));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Driver_GetHeaderInformation == nullptr) )
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_scanlaboie_getversion", (void**)&(pWrapperTable->m_GetVersion));
+		if ( (eLookupError != 0) || (pWrapperTable->m_GetVersion == nullptr) )
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_scanlaboie_getlasterror", (void**)&(pWrapperTable->m_GetLastError));
+		if ( (eLookupError != 0) || (pWrapperTable->m_GetLastError == nullptr) )
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_scanlaboie_releaseinstance", (void**)&(pWrapperTable->m_ReleaseInstance));
+		if ( (eLookupError != 0) || (pWrapperTable->m_ReleaseInstance == nullptr) )
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_scanlaboie_acquireinstance", (void**)&(pWrapperTable->m_AcquireInstance));
+		if ( (eLookupError != 0) || (pWrapperTable->m_AcquireInstance == nullptr) )
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_scanlaboie_injectcomponent", (void**)&(pWrapperTable->m_InjectComponent));
+		if ( (eLookupError != 0) || (pWrapperTable->m_InjectComponent == nullptr) )
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_scanlaboie_getsymbollookupmethod", (void**)&(pWrapperTable->m_GetSymbolLookupMethod));
+		if ( (eLookupError != 0) || (pWrapperTable->m_GetSymbolLookupMethod == nullptr) )
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriver_scanlaboie_createdriver", (void**)&(pWrapperTable->m_CreateDriver));
+		if ( (eLookupError != 0) || (pWrapperTable->m_CreateDriver == nullptr) )
+			return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+}
+
+	
+	
+	/**
+	 * Method definitions for class CBase
+	 */
+	
+	/**
+	 * Method definitions for class CDriver
+	 */
+	
+	/**
+	* CDriver::GetName - returns the name identifier of the driver
+	* @return Name of the driver.
+	*/
+	std::string CDriver::GetName()
+	{
+		LibMCDriver_ScanLabOIE_uint32 bytesNeededName = 0;
+		LibMCDriver_ScanLabOIE_uint32 bytesWrittenName = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetName(m_pHandle, 0, &bytesNeededName, nullptr));
+		std::vector<char> bufferName(bytesNeededName);
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetName(m_pHandle, bytesNeededName, &bytesWrittenName, &bufferName[0]));
+		
+		return std::string(&bufferName[0]);
+	}
+	
+	/**
+	* CDriver::GetType - returns the type identifier of the driver
+	* @return Type of the driver.
+	*/
+	std::string CDriver::GetType()
+	{
+		LibMCDriver_ScanLabOIE_uint32 bytesNeededType = 0;
+		LibMCDriver_ScanLabOIE_uint32 bytesWrittenType = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetType(m_pHandle, 0, &bytesNeededType, nullptr));
+		std::vector<char> bufferType(bytesNeededType);
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetType(m_pHandle, bytesNeededType, &bytesWrittenType, &bufferType[0]));
+		
+		return std::string(&bufferType[0]);
+	}
+	
+	/**
+	* CDriver::GetVersion - returns the version identifiers of the driver
+	* @param[out] nMajor - Major version.
+	* @param[out] nMinor - Minor version.
+	* @param[out] nMicro - Micro version.
+	* @param[out] sBuild - Build identifier.
+	*/
+	void CDriver::GetVersion(LibMCDriver_ScanLabOIE_uint32 & nMajor, LibMCDriver_ScanLabOIE_uint32 & nMinor, LibMCDriver_ScanLabOIE_uint32 & nMicro, std::string & sBuild)
+	{
+		LibMCDriver_ScanLabOIE_uint32 bytesNeededBuild = 0;
+		LibMCDriver_ScanLabOIE_uint32 bytesWrittenBuild = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetVersion(m_pHandle, &nMajor, &nMinor, &nMicro, 0, &bytesNeededBuild, nullptr));
+		std::vector<char> bufferBuild(bytesNeededBuild);
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetVersion(m_pHandle, &nMajor, &nMinor, &nMicro, bytesNeededBuild, &bytesWrittenBuild, &bufferBuild[0]));
+		sBuild = std::string(&bufferBuild[0]);
+	}
+	
+	/**
+	* CDriver::GetHeaderInformation - returns the header information
+	* @param[out] sNameSpace - NameSpace of the driver.
+	* @param[out] sBaseName - BaseName of the driver.
+	*/
+	void CDriver::GetHeaderInformation(std::string & sNameSpace, std::string & sBaseName)
+	{
+		LibMCDriver_ScanLabOIE_uint32 bytesNeededNameSpace = 0;
+		LibMCDriver_ScanLabOIE_uint32 bytesWrittenNameSpace = 0;
+		LibMCDriver_ScanLabOIE_uint32 bytesNeededBaseName = 0;
+		LibMCDriver_ScanLabOIE_uint32 bytesWrittenBaseName = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetHeaderInformation(m_pHandle, 0, &bytesNeededNameSpace, nullptr, 0, &bytesNeededBaseName, nullptr));
+		std::vector<char> bufferNameSpace(bytesNeededNameSpace);
+		std::vector<char> bufferBaseName(bytesNeededBaseName);
+		CheckError(m_pWrapper->m_WrapperTable.m_Driver_GetHeaderInformation(m_pHandle, bytesNeededNameSpace, &bytesWrittenNameSpace, &bufferNameSpace[0], bytesNeededBaseName, &bytesWrittenBaseName, &bufferBaseName[0]));
+		sNameSpace = std::string(&bufferNameSpace[0]);
+		sBaseName = std::string(&bufferBaseName[0]);
+	}
+	
+	/**
+	 * Method definitions for class CDriver_ScanLab_OIE
+	 */
+
+} // namespace LibMCDriver_ScanLabOIE
+
+#endif // __LIBMCDRIVER_SCANLABOIE_CPPHEADER_DYNAMIC_CPP
+
diff --git a/Drivers/ScanLabOIE/Headers/CppDynamic/libmcdriver_scanlaboie_types.hpp b/Drivers/ScanLabOIE/Headers/CppDynamic/libmcdriver_scanlaboie_types.hpp
new file mode 100644
index 00000000..a2e1c637
--- /dev/null
+++ b/Drivers/ScanLabOIE/Headers/CppDynamic/libmcdriver_scanlaboie_types.hpp
@@ -0,0 +1,141 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file with basic types in
+order to allow an easy use of MC Driver ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDRIVER_SCANLABOIE_TYPES_HEADER_CPP
+#define __LIBMCDRIVER_SCANLABOIE_TYPES_HEADER_CPP
+
+
+/*************************************************************************************************************************
+ Scalar types definition
+**************************************************************************************************************************/
+
+#ifdef LIBMCDRIVER_SCANLABOIE_USELEGACYINTEGERTYPES
+
+typedef unsigned char LibMCDriver_ScanLabOIE_uint8;
+typedef unsigned short LibMCDriver_ScanLabOIE_uint16 ;
+typedef unsigned int LibMCDriver_ScanLabOIE_uint32;
+typedef unsigned long long LibMCDriver_ScanLabOIE_uint64;
+typedef char LibMCDriver_ScanLabOIE_int8;
+typedef short LibMCDriver_ScanLabOIE_int16;
+typedef int LibMCDriver_ScanLabOIE_int32;
+typedef long long LibMCDriver_ScanLabOIE_int64;
+
+#else // LIBMCDRIVER_SCANLABOIE_USELEGACYINTEGERTYPES
+
+#include <stdint.h>
+
+typedef uint8_t LibMCDriver_ScanLabOIE_uint8;
+typedef uint16_t LibMCDriver_ScanLabOIE_uint16;
+typedef uint32_t LibMCDriver_ScanLabOIE_uint32;
+typedef uint64_t LibMCDriver_ScanLabOIE_uint64;
+typedef int8_t LibMCDriver_ScanLabOIE_int8;
+typedef int16_t LibMCDriver_ScanLabOIE_int16;
+typedef int32_t LibMCDriver_ScanLabOIE_int32;
+typedef int64_t LibMCDriver_ScanLabOIE_int64 ;
+
+#endif // LIBMCDRIVER_SCANLABOIE_USELEGACYINTEGERTYPES
+
+typedef float LibMCDriver_ScanLabOIE_single;
+typedef double LibMCDriver_ScanLabOIE_double;
+
+/*************************************************************************************************************************
+ General type definitions
+**************************************************************************************************************************/
+
+typedef LibMCDriver_ScanLabOIE_int32 LibMCDriver_ScanLabOIEResult;
+typedef void * LibMCDriver_ScanLabOIEHandle;
+typedef void * LibMCDriver_ScanLabOIE_pvoid;
+
+/*************************************************************************************************************************
+ Version for LibMCDriver_ScanLabOIE
+**************************************************************************************************************************/
+
+#define LIBMCDRIVER_SCANLABOIE_VERSION_MAJOR 1
+#define LIBMCDRIVER_SCANLABOIE_VERSION_MINOR 0
+#define LIBMCDRIVER_SCANLABOIE_VERSION_MICRO 0
+#define LIBMCDRIVER_SCANLABOIE_VERSION_PRERELEASEINFO ""
+#define LIBMCDRIVER_SCANLABOIE_VERSION_BUILDINFO ""
+
+/*************************************************************************************************************************
+ Error constants for LibMCDriver_ScanLabOIE
+**************************************************************************************************************************/
+
+#define LIBMCDRIVER_SCANLABOIE_SUCCESS 0
+#define LIBMCDRIVER_SCANLABOIE_ERROR_NOTIMPLEMENTED 1
+#define LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM 2
+#define LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST 3
+#define LIBMCDRIVER_SCANLABOIE_ERROR_BUFFERTOOSMALL 4
+#define LIBMCDRIVER_SCANLABOIE_ERROR_GENERICEXCEPTION 5
+#define LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTLOADLIBRARY 6
+#define LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT 7
+#define LIBMCDRIVER_SCANLABOIE_ERROR_INCOMPATIBLEBINARYVERSION 8
+
+/*************************************************************************************************************************
+ Error strings for LibMCDriver_ScanLabOIE
+**************************************************************************************************************************/
+
+inline const char * LIBMCDRIVER_SCANLABOIE_GETERRORSTRING (LibMCDriver_ScanLabOIEResult nErrorCode) {
+  switch (nErrorCode) {
+    case LIBMCDRIVER_SCANLABOIE_SUCCESS: return "no error";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_NOTIMPLEMENTED: return "functionality not implemented";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM: return "an invalid parameter was passed";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST: return "a type cast failed";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_BUFFERTOOSMALL: return "a provided buffer is too small";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_GENERICEXCEPTION: return "a generic exception occurred";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTLOADLIBRARY: return "the library could not be loaded";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT: return "a required exported symbol could not be found in the library";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_INCOMPATIBLEBINARYVERSION: return "the version of the binary interface does not match the bindings interface";
+    default: return "unknown error";
+  }
+}
+
+/*************************************************************************************************************************
+ Declaration of handle classes 
+**************************************************************************************************************************/
+
+typedef LibMCDriver_ScanLabOIEHandle LibMCDriver_ScanLabOIE_Base;
+typedef LibMCDriver_ScanLabOIEHandle LibMCDriver_ScanLabOIE_Driver;
+typedef LibMCDriver_ScanLabOIEHandle LibMCDriver_ScanLabOIE_Driver_ScanLab_OIE;
+
+namespace LibMCDriver_ScanLabOIE {
+
+} // namespace LibMCDriver_ScanLabOIE;
+
+// define legacy C-names for enums, structs and function types
+
+#endif // __LIBMCDRIVER_SCANLABOIE_TYPES_HEADER_CPP
diff --git a/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_abi.hpp b/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_abi.hpp
new file mode 100644
index 00000000..925ccef8
--- /dev/null
+++ b/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_abi.hpp
@@ -0,0 +1,197 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file in order to allow an easy
+ use of MC Driver ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDRIVER_SCANLABOIE_HEADER_CPP
+#define __LIBMCDRIVER_SCANLABOIE_HEADER_CPP
+
+#ifdef __LIBMCDRIVER_SCANLABOIE_EXPORTS
+#ifdef _WIN32
+#define LIBMCDRIVER_SCANLABOIE_DECLSPEC __declspec (dllexport)
+#else // _WIN32
+#define LIBMCDRIVER_SCANLABOIE_DECLSPEC __attribute__((visibility("default")))
+#endif // _WIN32
+#else // __LIBMCDRIVER_SCANLABOIE_EXPORTS
+#define LIBMCDRIVER_SCANLABOIE_DECLSPEC
+#endif // __LIBMCDRIVER_SCANLABOIE_EXPORTS
+
+#include "libmcdriver_scanlaboie_types.hpp"
+
+#include "libmcdriverenv_dynamic.hpp"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*************************************************************************************************************************
+ Class definition for Base
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for Driver
+**************************************************************************************************************************/
+
+/**
+* returns the name identifier of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_driver_getname(LibMCDriver_ScanLabOIE_Driver pDriver, const LibMCDriver_ScanLabOIE_uint32 nNameBufferSize, LibMCDriver_ScanLabOIE_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* returns the type identifier of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nTypeBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTypeBuffer -  buffer of Type of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_driver_gettype(LibMCDriver_ScanLabOIE_Driver pDriver, const LibMCDriver_ScanLabOIE_uint32 nTypeBufferSize, LibMCDriver_ScanLabOIE_uint32* pTypeNeededChars, char * pTypeBuffer);
+
+/**
+* returns the version identifiers of the driver
+*
+* @param[in] pDriver - Driver instance.
+* @param[out] pMajor - Major version.
+* @param[out] pMinor - Minor version.
+* @param[out] pMicro - Micro version.
+* @param[in] nBuildBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBuildNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBuildBuffer -  buffer of Build identifier., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_driver_getversion(LibMCDriver_ScanLabOIE_Driver pDriver, LibMCDriver_ScanLabOIE_uint32 * pMajor, LibMCDriver_ScanLabOIE_uint32 * pMinor, LibMCDriver_ScanLabOIE_uint32 * pMicro, const LibMCDriver_ScanLabOIE_uint32 nBuildBufferSize, LibMCDriver_ScanLabOIE_uint32* pBuildNeededChars, char * pBuildBuffer);
+
+/**
+* returns the header information
+*
+* @param[in] pDriver - Driver instance.
+* @param[in] nNameSpaceBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameSpaceNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameSpaceBuffer -  buffer of NameSpace of the driver., may be NULL
+* @param[in] nBaseNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBaseNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBaseNameBuffer -  buffer of BaseName of the driver., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_driver_getheaderinformation(LibMCDriver_ScanLabOIE_Driver pDriver, const LibMCDriver_ScanLabOIE_uint32 nNameSpaceBufferSize, LibMCDriver_ScanLabOIE_uint32* pNameSpaceNeededChars, char * pNameSpaceBuffer, const LibMCDriver_ScanLabOIE_uint32 nBaseNameBufferSize, LibMCDriver_ScanLabOIE_uint32* pBaseNameNeededChars, char * pBaseNameBuffer);
+
+/*************************************************************************************************************************
+ Class definition for Driver_ScanLab_OIE
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Global functions
+**************************************************************************************************************************/
+
+/**
+* retrieves the binary version of this library.
+*
+* @param[out] pMajor - returns the major version of this library
+* @param[out] pMinor - returns the minor version of this library
+* @param[out] pMicro - returns the micro version of this library
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_getversion(LibMCDriver_ScanLabOIE_uint32 * pMajor, LibMCDriver_ScanLabOIE_uint32 * pMinor, LibMCDriver_ScanLabOIE_uint32 * pMicro);
+
+/**
+* Returns the last error recorded on this object
+*
+* @param[in] pInstance - Instance Handle
+* @param[in] nErrorMessageBufferSize - size of the buffer (including trailing 0)
+* @param[out] pErrorMessageNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pErrorMessageBuffer -  buffer of Message of the last error, may be NULL
+* @param[out] pHasError - Is there a last error to query
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_getlasterror(LibMCDriver_ScanLabOIE_Base pInstance, const LibMCDriver_ScanLabOIE_uint32 nErrorMessageBufferSize, LibMCDriver_ScanLabOIE_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError);
+
+/**
+* Releases shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_releaseinstance(LibMCDriver_ScanLabOIE_Base pInstance);
+
+/**
+* Acquires shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_acquireinstance(LibMCDriver_ScanLabOIE_Base pInstance);
+
+/**
+* Injects an imported component for usage within this component
+*
+* @param[in] pNameSpace - NameSpace of the injected component
+* @param[in] pSymbolAddressMethod - Address of the SymbolAddressMethod of the injected component
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_injectcomponent(const char * pNameSpace, LibMCDriver_ScanLabOIE_pvoid pSymbolAddressMethod);
+
+/**
+* Returns the address of the SymbolLookupMethod
+*
+* @param[out] pSymbolLookupMethod - Address of the SymbolAddressMethod
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_getsymbollookupmethod(LibMCDriver_ScanLabOIE_pvoid * pSymbolLookupMethod);
+
+/**
+* Creates a driver instance with a specific name.
+*
+* @param[in] pName - Name of driver to be created.
+* @param[in] pType - Type of driver to be created.
+* @param[in] pDriverEnvironment - Environment of this driver.
+* @param[out] pInstance - New Driver instance
+* @return error code or 0 (success)
+*/
+LIBMCDRIVER_SCANLABOIE_DECLSPEC LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_createdriver(const char * pName, const char * pType, LibMCDriverEnv_DriverEnvironment pDriverEnvironment, LibMCDriver_ScanLabOIE_Driver * pInstance);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __LIBMCDRIVER_SCANLABOIE_HEADER_CPP
+
diff --git a/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_interfaceexception.cpp b/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_interfaceexception.cpp
new file mode 100644
index 00000000..129a4454
--- /dev/null
+++ b/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_interfaceexception.cpp
@@ -0,0 +1,68 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++ Implementation file with the basic internal
+ exception type in order to allow an easy use of MC Driver ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+
+#include <string>
+
+#include "libmcdriver_scanlaboie_interfaceexception.hpp"
+
+/*************************************************************************************************************************
+ Class ELibMCDriver_ScanLabOIEInterfaceException
+**************************************************************************************************************************/
+ELibMCDriver_ScanLabOIEInterfaceException::ELibMCDriver_ScanLabOIEInterfaceException(LibMCDriver_ScanLabOIEResult errorCode)
+	: m_errorMessage(LIBMCDRIVER_SCANLABOIE_GETERRORSTRING (errorCode))
+{
+	m_errorCode = errorCode;
+}
+
+ELibMCDriver_ScanLabOIEInterfaceException::ELibMCDriver_ScanLabOIEInterfaceException(LibMCDriver_ScanLabOIEResult errorCode, std::string errorMessage)
+	: m_errorMessage(errorMessage + " (" + std::to_string (errorCode) + ")")
+{
+	m_errorCode = errorCode;
+}
+
+LibMCDriver_ScanLabOIEResult ELibMCDriver_ScanLabOIEInterfaceException::getErrorCode ()
+{
+	return m_errorCode;
+}
+
+const char * ELibMCDriver_ScanLabOIEInterfaceException::what () const noexcept
+{
+	return m_errorMessage.c_str();
+}
+
diff --git a/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_interfaceexception.hpp b/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_interfaceexception.hpp
new file mode 100644
index 00000000..5826f8ed
--- /dev/null
+++ b/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_interfaceexception.hpp
@@ -0,0 +1,83 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++ Header file with the basic internal
+ exception type in order to allow an easy use of MC Driver ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDRIVER_SCANLABOIE_INTERFACEEXCEPTION_HEADER
+#define __LIBMCDRIVER_SCANLABOIE_INTERFACEEXCEPTION_HEADER
+
+#include <exception>
+#include <stdexcept>
+#include "libmcdriver_scanlaboie_types.hpp"
+
+/*************************************************************************************************************************
+ Class ELibMCDriver_ScanLabOIEInterfaceException
+**************************************************************************************************************************/
+
+
+class ELibMCDriver_ScanLabOIEInterfaceException : public std::exception {
+protected:
+	/**
+	* Error code for the Exception.
+	*/
+	LibMCDriver_ScanLabOIEResult m_errorCode;
+	/**
+	* Error message for the Exception.
+	*/
+	std::string m_errorMessage;
+
+public:
+	/**
+	* Exception Constructor.
+	*/
+	ELibMCDriver_ScanLabOIEInterfaceException(LibMCDriver_ScanLabOIEResult errorCode);
+
+	/**
+	* Custom Exception Constructor.
+	*/
+	ELibMCDriver_ScanLabOIEInterfaceException(LibMCDriver_ScanLabOIEResult errorCode, std::string errorMessage);
+
+	/**
+	* Returns error code
+	*/
+	LibMCDriver_ScanLabOIEResult getErrorCode();
+	/**
+	* Returns error message
+	*/
+	const char* what() const noexcept override;
+};
+
+#endif // __LIBMCDRIVER_SCANLABOIE_INTERFACEEXCEPTION_HEADER
diff --git a/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_interfaces.hpp b/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_interfaces.hpp
new file mode 100644
index 00000000..f00534f7
--- /dev/null
+++ b/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_interfaces.hpp
@@ -0,0 +1,364 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++ header file in order to allow easy
+development of MC Driver ScanLab Open Interface Extension. The implementer of MC Driver ScanLab Open Interface Extension needs to
+derive concrete classes from the abstract classes in this header.
+
+Interface version: 1.0.0
+
+*/
+
+
+#ifndef __LIBMCDRIVER_SCANLABOIE_CPPINTERFACES
+#define __LIBMCDRIVER_SCANLABOIE_CPPINTERFACES
+
+#include <string>
+#include <memory>
+
+#include "libmcdriver_scanlaboie_types.hpp"
+
+
+#include "libmcdriverenv_dynamic.hpp"
+
+namespace LibMCDriver_ScanLabOIE {
+namespace Impl {
+
+/**
+ Forward declarations of class interfaces
+*/
+class IBase;
+class IDriver;
+class IDriver_ScanLab_OIE;
+
+
+
+/*************************************************************************************************************************
+ Parameter Cache definitions
+**************************************************************************************************************************/
+
+class ParameterCache {
+	public:
+		virtual ~ParameterCache() {}
+};
+
+template <class T1> class ParameterCache_1 : public ParameterCache {
+	private:
+		T1 m_param1;
+	public:
+		ParameterCache_1 (const T1 & param1)
+			: m_param1 (param1)
+		{
+		}
+
+		void retrieveData (T1 & param1)
+		{
+			param1 = m_param1;
+		}
+};
+
+template <class T1, class T2> class ParameterCache_2 : public ParameterCache {
+	private:
+		T1 m_param1;
+		T2 m_param2;
+	public:
+		ParameterCache_2 (const T1 & param1, const T2 & param2)
+			: m_param1 (param1), m_param2 (param2)
+		{
+		}
+
+		void retrieveData (T1 & param1, T2 & param2)
+		{
+			param1 = m_param1;
+			param2 = m_param2;
+		}
+};
+
+template <class T1, class T2, class T3> class ParameterCache_3 : public ParameterCache {
+	private:
+		T1 m_param1;
+		T2 m_param2;
+		T3 m_param3;
+	public:
+		ParameterCache_3 (const T1 & param1, const T2 & param2, const T3 & param3)
+			: m_param1 (param1), m_param2 (param2), m_param3 (param3)
+		{
+		}
+
+		void retrieveData (T1 & param1, T2 & param2, T3 & param3)
+		{
+			param1 = m_param1;
+			param2 = m_param2;
+			param3 = m_param3;
+		}
+};
+
+template <class T1, class T2, class T3, class T4> class ParameterCache_4 : public ParameterCache {
+	private:
+		T1 m_param1;
+		T2 m_param2;
+		T3 m_param3;
+		T4 m_param4;
+	public:
+		ParameterCache_4 (const T1 & param1, const T2 & param2, const T3 & param3, const T4 & param4)
+			: m_param1 (param1), m_param2 (param2), m_param3 (param3), m_param4 (param4)
+		{
+		}
+
+		void retrieveData (T1 & param1, T2 & param2, T3 & param3, T4 & param4)
+		{
+			param1 = m_param1;
+			param2 = m_param2;
+			param3 = m_param3;
+			param4 = m_param4;
+		}
+};
+
+
+/*************************************************************************************************************************
+ Class interface for Base 
+**************************************************************************************************************************/
+
+class IBase {
+private:
+	std::unique_ptr<ParameterCache> m_ParameterCache;
+public:
+	/**
+	* IBase::~IBase - virtual destructor of IBase
+	*/
+	virtual ~IBase() {};
+
+	/**
+	* IBase::ReleaseBaseClassInterface - Releases ownership of a base class interface. Deletes the reference, if necessary.
+	* @param[in] pIBase - The base class instance to release
+	*/
+	static void ReleaseBaseClassInterface(IBase* pIBase)
+	{
+		if (pIBase) {
+			pIBase->DecRefCount();
+		}
+	};
+
+	/**
+	* IBase::AcquireBaseClassInterface - Acquires shared ownership of a base class interface.
+	* @param[in] pIBase - The base class instance to acquire
+	*/
+	static void AcquireBaseClassInterface(IBase* pIBase)
+	{
+		if (pIBase) {
+			pIBase->IncRefCount();
+		}
+	};
+
+
+	/**
+	* IBase::GetLastErrorMessage - Returns the last error registered of this class instance
+	* @param[out] sErrorMessage - Message of the last error registered
+	* @return Has an error been registered already
+	*/
+	virtual bool GetLastErrorMessage(std::string & sErrorMessage) = 0;
+
+	/**
+	* IBase::ClearErrorMessages - Clears all registered messages of this class instance
+	*/
+	virtual void ClearErrorMessages() = 0;
+
+	/**
+	* IBase::RegisterErrorMessage - Registers an error message with this class instance
+	* @param[in] sErrorMessage - Error message to register
+	*/
+	virtual void RegisterErrorMessage(const std::string & sErrorMessage) = 0;
+
+	/**
+	* IBase::IncRefCount - Increases the reference count of a class instance
+	*/
+	virtual void IncRefCount() = 0;
+
+	/**
+	* IBase::DecRefCount - Decreases the reference count of a class instance and free releases it, if the last reference has been removed
+	* @return Has the object been released
+	*/
+	virtual bool DecRefCount() = 0;
+
+	/**
+	* IBase::_setCache - set parameter cache of object
+	*/
+	void _setCache(ParameterCache * pCache)
+	{
+		m_ParameterCache.reset(pCache);
+	}
+
+	/**
+	* IBase::_getCache - returns parameter cache of object
+	*/
+	ParameterCache* _getCache()
+	{
+		return m_ParameterCache.get();
+	}
+
+};
+
+
+/**
+ Definition of a shared pointer class for IBase
+*/
+template<class T>
+class IBaseSharedPtr : public std::shared_ptr<T>
+{
+public:
+	explicit IBaseSharedPtr(T* t = nullptr)
+		: std::shared_ptr<T>(t, IBase::ReleaseBaseClassInterface)
+	{
+		t->IncRefCount();
+	}
+
+	// Reset function, as it also needs to properly set the deleter.
+	void reset(T* t = nullptr)
+	{
+		std::shared_ptr<T>::reset(t, IBase::ReleaseBaseClassInterface);
+	}
+
+	// Get-function that increases the Base class's reference count
+	T* getCoOwningPtr()
+	{
+		T* t = this->get();
+		t->IncRefCount();
+		return t;
+	}
+};
+
+
+typedef IBaseSharedPtr<IBase> PIBase;
+
+
+/*************************************************************************************************************************
+ Class interface for Driver 
+**************************************************************************************************************************/
+
+class IDriver : public virtual IBase {
+public:
+	/**
+	* IDriver::GetName - returns the name identifier of the driver
+	* @return Name of the driver.
+	*/
+	virtual std::string GetName() = 0;
+
+	/**
+	* IDriver::GetType - returns the type identifier of the driver
+	* @return Type of the driver.
+	*/
+	virtual std::string GetType() = 0;
+
+	/**
+	* IDriver::GetVersion - returns the version identifiers of the driver
+	* @param[out] nMajor - Major version.
+	* @param[out] nMinor - Minor version.
+	* @param[out] nMicro - Micro version.
+	* @param[out] sBuild - Build identifier.
+	*/
+	virtual void GetVersion(LibMCDriver_ScanLabOIE_uint32 & nMajor, LibMCDriver_ScanLabOIE_uint32 & nMinor, LibMCDriver_ScanLabOIE_uint32 & nMicro, std::string & sBuild) = 0;
+
+	/**
+	* IDriver::GetHeaderInformation - returns the header information
+	* @param[out] sNameSpace - NameSpace of the driver.
+	* @param[out] sBaseName - BaseName of the driver.
+	*/
+	virtual void GetHeaderInformation(std::string & sNameSpace, std::string & sBaseName) = 0;
+
+};
+
+typedef IBaseSharedPtr<IDriver> PIDriver;
+
+
+/*************************************************************************************************************************
+ Class interface for Driver_ScanLab_OIE 
+**************************************************************************************************************************/
+
+class IDriver_ScanLab_OIE : public virtual IDriver {
+public:
+};
+
+typedef IBaseSharedPtr<IDriver_ScanLab_OIE> PIDriver_ScanLab_OIE;
+
+
+/*************************************************************************************************************************
+ Global functions declarations
+**************************************************************************************************************************/
+class CWrapper {
+public:
+	// Injected Components
+	static LibMCDriverEnv::PWrapper sPLibMCDriverEnvWrapper;
+
+	/**
+	* Ilibmcdriver_scanlaboie::GetVersion - retrieves the binary version of this library.
+	* @param[out] nMajor - returns the major version of this library
+	* @param[out] nMinor - returns the minor version of this library
+	* @param[out] nMicro - returns the micro version of this library
+	*/
+	static void GetVersion(LibMCDriver_ScanLabOIE_uint32 & nMajor, LibMCDriver_ScanLabOIE_uint32 & nMinor, LibMCDriver_ScanLabOIE_uint32 & nMicro);
+
+	/**
+	* Ilibmcdriver_scanlaboie::GetLastError - Returns the last error recorded on this object
+	* @param[in] pInstance - Instance Handle
+	* @param[out] sErrorMessage - Message of the last error
+	* @return Is there a last error to query
+	*/
+	static bool GetLastError(IBase* pInstance, std::string & sErrorMessage);
+
+	/**
+	* Ilibmcdriver_scanlaboie::ReleaseInstance - Releases shared ownership of an Instance
+	* @param[in] pInstance - Instance Handle
+	*/
+	static void ReleaseInstance(IBase* pInstance);
+
+	/**
+	* Ilibmcdriver_scanlaboie::AcquireInstance - Acquires shared ownership of an Instance
+	* @param[in] pInstance - Instance Handle
+	*/
+	static void AcquireInstance(IBase* pInstance);
+
+	/**
+	* Ilibmcdriver_scanlaboie::CreateDriver - Creates a driver instance with a specific name.
+	* @param[in] sName - Name of driver to be created.
+	* @param[in] sType - Type of driver to be created.
+	* @param[in] pDriverEnvironment - Environment of this driver.
+	* @return New Driver instance
+	*/
+	static IDriver * CreateDriver(const std::string & sName, const std::string & sType, LibMCDriverEnv::PDriverEnvironment pDriverEnvironment);
+
+};
+
+LibMCDriver_ScanLabOIEResult LibMCDriver_ScanLabOIE_GetProcAddress (const char * pProcName, void ** ppProcAddress);
+
+} // namespace Impl
+} // namespace LibMCDriver_ScanLabOIE
+
+#endif // __LIBMCDRIVER_SCANLABOIE_CPPINTERFACES
diff --git a/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_interfacewrapper.cpp b/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_interfacewrapper.cpp
new file mode 100644
index 00000000..c2fa4a13
--- /dev/null
+++ b/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_interfacewrapper.cpp
@@ -0,0 +1,552 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++ implementation file in order to allow easy
+development of MC Driver ScanLab Open Interface Extension. The functions in this file need to be implemented. It needs to be generated only once.
+
+Interface version: 1.0.0
+
+*/
+
+#include "libmcdriver_scanlaboie_abi.hpp"
+#include "libmcdriver_scanlaboie_interfaces.hpp"
+#include "libmcdriver_scanlaboie_interfaceexception.hpp"
+
+#include <map>
+
+using namespace LibMCDriver_ScanLabOIE::Impl;
+
+LibMCDriver_ScanLabOIEResult handleLibMCDriver_ScanLabOIEException(IBase * pIBaseClass, ELibMCDriver_ScanLabOIEInterfaceException & Exception)
+{
+	LibMCDriver_ScanLabOIEResult errorCode = Exception.getErrorCode();
+
+	if (pIBaseClass != nullptr)
+		pIBaseClass->RegisterErrorMessage(Exception.what());
+
+	return errorCode;
+}
+
+LibMCDriver_ScanLabOIEResult handleStdException(IBase * pIBaseClass, std::exception & Exception)
+{
+	LibMCDriver_ScanLabOIEResult errorCode = LIBMCDRIVER_SCANLABOIE_ERROR_GENERICEXCEPTION;
+
+	if (pIBaseClass != nullptr)
+		pIBaseClass->RegisterErrorMessage(Exception.what());
+
+	return errorCode;
+}
+
+LibMCDriver_ScanLabOIEResult handleUnhandledException(IBase * pIBaseClass)
+{
+	LibMCDriver_ScanLabOIEResult errorCode = LIBMCDRIVER_SCANLABOIE_ERROR_GENERICEXCEPTION;
+
+	if (pIBaseClass != nullptr)
+		pIBaseClass->RegisterErrorMessage("Unhandled Exception");
+
+	return errorCode;
+}
+
+
+
+/*************************************************************************************************************************
+ Class implementation for Base
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class implementation for Driver
+**************************************************************************************************************************/
+LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_driver_getname(LibMCDriver_ScanLabOIE_Driver pDriver, const LibMCDriver_ScanLabOIE_uint32 nNameBufferSize, LibMCDriver_ScanLabOIE_uint32* pNameNeededChars, char * pNameBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pDriver;
+
+	try {
+		if ( (!pNameBuffer) && !(pNameNeededChars) )
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		std::string sName("");
+		IDriver* pIDriver = dynamic_cast<IDriver*>(pIBaseClass);
+		if (!pIDriver)
+			throw ELibMCDriver_ScanLabOIEInterfaceException(LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pNameBuffer == nullptr);
+		if (isCacheCall) {
+			sName = pIDriver->GetName();
+
+			pIDriver->_setCache (new ParameterCache_1<std::string> (sName));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIDriver->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDriver_ScanLabOIEInterfaceException(LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST);
+			cache->retrieveData (sName);
+			pIDriver->_setCache (nullptr);
+		}
+		
+		if (pNameNeededChars)
+			*pNameNeededChars = (LibMCDriver_ScanLabOIE_uint32) (sName.size()+1);
+		if (pNameBuffer) {
+			if (sName.size() >= nNameBufferSize)
+				throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iName = 0; iName < sName.size(); iName++)
+				pNameBuffer[iName] = sName[iName];
+			pNameBuffer[sName.size()] = 0;
+		}
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+	catch (ELibMCDriver_ScanLabOIEInterfaceException & Exception) {
+		return handleLibMCDriver_ScanLabOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_driver_gettype(LibMCDriver_ScanLabOIE_Driver pDriver, const LibMCDriver_ScanLabOIE_uint32 nTypeBufferSize, LibMCDriver_ScanLabOIE_uint32* pTypeNeededChars, char * pTypeBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pDriver;
+
+	try {
+		if ( (!pTypeBuffer) && !(pTypeNeededChars) )
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		std::string sType("");
+		IDriver* pIDriver = dynamic_cast<IDriver*>(pIBaseClass);
+		if (!pIDriver)
+			throw ELibMCDriver_ScanLabOIEInterfaceException(LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pTypeBuffer == nullptr);
+		if (isCacheCall) {
+			sType = pIDriver->GetType();
+
+			pIDriver->_setCache (new ParameterCache_1<std::string> (sType));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIDriver->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDriver_ScanLabOIEInterfaceException(LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST);
+			cache->retrieveData (sType);
+			pIDriver->_setCache (nullptr);
+		}
+		
+		if (pTypeNeededChars)
+			*pTypeNeededChars = (LibMCDriver_ScanLabOIE_uint32) (sType.size()+1);
+		if (pTypeBuffer) {
+			if (sType.size() >= nTypeBufferSize)
+				throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iType = 0; iType < sType.size(); iType++)
+				pTypeBuffer[iType] = sType[iType];
+			pTypeBuffer[sType.size()] = 0;
+		}
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+	catch (ELibMCDriver_ScanLabOIEInterfaceException & Exception) {
+		return handleLibMCDriver_ScanLabOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_driver_getversion(LibMCDriver_ScanLabOIE_Driver pDriver, LibMCDriver_ScanLabOIE_uint32 * pMajor, LibMCDriver_ScanLabOIE_uint32 * pMinor, LibMCDriver_ScanLabOIE_uint32 * pMicro, const LibMCDriver_ScanLabOIE_uint32 nBuildBufferSize, LibMCDriver_ScanLabOIE_uint32* pBuildNeededChars, char * pBuildBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pDriver;
+
+	try {
+		if (!pMajor)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		if (!pMinor)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		if (!pMicro)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		if ( (!pBuildBuffer) && !(pBuildNeededChars) )
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		std::string sBuild("");
+		IDriver* pIDriver = dynamic_cast<IDriver*>(pIBaseClass);
+		if (!pIDriver)
+			throw ELibMCDriver_ScanLabOIEInterfaceException(LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pBuildBuffer == nullptr);
+		if (isCacheCall) {
+			pIDriver->GetVersion(*pMajor, *pMinor, *pMicro, sBuild);
+
+			pIDriver->_setCache (new ParameterCache_4<LibMCDriver_ScanLabOIE_uint32, LibMCDriver_ScanLabOIE_uint32, LibMCDriver_ScanLabOIE_uint32, std::string> (*pMajor, *pMinor, *pMicro, sBuild));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_4<LibMCDriver_ScanLabOIE_uint32, LibMCDriver_ScanLabOIE_uint32, LibMCDriver_ScanLabOIE_uint32, std::string>*> (pIDriver->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDriver_ScanLabOIEInterfaceException(LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST);
+			cache->retrieveData (*pMajor, *pMinor, *pMicro, sBuild);
+			pIDriver->_setCache (nullptr);
+		}
+		
+		if (pBuildNeededChars)
+			*pBuildNeededChars = (LibMCDriver_ScanLabOIE_uint32) (sBuild.size()+1);
+		if (pBuildBuffer) {
+			if (sBuild.size() >= nBuildBufferSize)
+				throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iBuild = 0; iBuild < sBuild.size(); iBuild++)
+				pBuildBuffer[iBuild] = sBuild[iBuild];
+			pBuildBuffer[sBuild.size()] = 0;
+		}
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+	catch (ELibMCDriver_ScanLabOIEInterfaceException & Exception) {
+		return handleLibMCDriver_ScanLabOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_driver_getheaderinformation(LibMCDriver_ScanLabOIE_Driver pDriver, const LibMCDriver_ScanLabOIE_uint32 nNameSpaceBufferSize, LibMCDriver_ScanLabOIE_uint32* pNameSpaceNeededChars, char * pNameSpaceBuffer, const LibMCDriver_ScanLabOIE_uint32 nBaseNameBufferSize, LibMCDriver_ScanLabOIE_uint32* pBaseNameNeededChars, char * pBaseNameBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pDriver;
+
+	try {
+		if ( (!pNameSpaceBuffer) && !(pNameSpaceNeededChars) )
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		if ( (!pBaseNameBuffer) && !(pBaseNameNeededChars) )
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		std::string sNameSpace("");
+		std::string sBaseName("");
+		IDriver* pIDriver = dynamic_cast<IDriver*>(pIBaseClass);
+		if (!pIDriver)
+			throw ELibMCDriver_ScanLabOIEInterfaceException(LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pNameSpaceBuffer == nullptr) || (pBaseNameBuffer == nullptr);
+		if (isCacheCall) {
+			pIDriver->GetHeaderInformation(sNameSpace, sBaseName);
+
+			pIDriver->_setCache (new ParameterCache_2<std::string, std::string> (sNameSpace, sBaseName));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_2<std::string, std::string>*> (pIDriver->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDriver_ScanLabOIEInterfaceException(LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST);
+			cache->retrieveData (sNameSpace, sBaseName);
+			pIDriver->_setCache (nullptr);
+		}
+		
+		if (pNameSpaceNeededChars)
+			*pNameSpaceNeededChars = (LibMCDriver_ScanLabOIE_uint32) (sNameSpace.size()+1);
+		if (pNameSpaceBuffer) {
+			if (sNameSpace.size() >= nNameSpaceBufferSize)
+				throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iNameSpace = 0; iNameSpace < sNameSpace.size(); iNameSpace++)
+				pNameSpaceBuffer[iNameSpace] = sNameSpace[iNameSpace];
+			pNameSpaceBuffer[sNameSpace.size()] = 0;
+		}
+		if (pBaseNameNeededChars)
+			*pBaseNameNeededChars = (LibMCDriver_ScanLabOIE_uint32) (sBaseName.size()+1);
+		if (pBaseNameBuffer) {
+			if (sBaseName.size() >= nBaseNameBufferSize)
+				throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iBaseName = 0; iBaseName < sBaseName.size(); iBaseName++)
+				pBaseNameBuffer[iBaseName] = sBaseName[iBaseName];
+			pBaseNameBuffer[sBaseName.size()] = 0;
+		}
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+	catch (ELibMCDriver_ScanLabOIEInterfaceException & Exception) {
+		return handleLibMCDriver_ScanLabOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for Driver_ScanLab_OIE
+**************************************************************************************************************************/
+
+
+/*************************************************************************************************************************
+ Function table lookup implementation
+**************************************************************************************************************************/
+
+LibMCDriver_ScanLabOIEResult LibMCDriver_ScanLabOIE::Impl::LibMCDriver_ScanLabOIE_GetProcAddress (const char * pProcName, void ** ppProcAddress)
+{
+	if (pProcName == nullptr)
+		return LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM;
+	if (ppProcAddress == nullptr)
+		return LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM;
+	*ppProcAddress = nullptr;
+	std::string sProcName (pProcName);
+	
+	if (sProcName == "libmcdriver_scanlaboie_driver_getname") 
+		*ppProcAddress = (void*) &libmcdriver_scanlaboie_driver_getname;
+	if (sProcName == "libmcdriver_scanlaboie_driver_gettype") 
+		*ppProcAddress = (void*) &libmcdriver_scanlaboie_driver_gettype;
+	if (sProcName == "libmcdriver_scanlaboie_driver_getversion") 
+		*ppProcAddress = (void*) &libmcdriver_scanlaboie_driver_getversion;
+	if (sProcName == "libmcdriver_scanlaboie_driver_getheaderinformation") 
+		*ppProcAddress = (void*) &libmcdriver_scanlaboie_driver_getheaderinformation;
+	if (sProcName == "libmcdriver_scanlaboie_getversion") 
+		*ppProcAddress = (void*) &libmcdriver_scanlaboie_getversion;
+	if (sProcName == "libmcdriver_scanlaboie_getlasterror") 
+		*ppProcAddress = (void*) &libmcdriver_scanlaboie_getlasterror;
+	if (sProcName == "libmcdriver_scanlaboie_releaseinstance") 
+		*ppProcAddress = (void*) &libmcdriver_scanlaboie_releaseinstance;
+	if (sProcName == "libmcdriver_scanlaboie_acquireinstance") 
+		*ppProcAddress = (void*) &libmcdriver_scanlaboie_acquireinstance;
+	if (sProcName == "libmcdriver_scanlaboie_injectcomponent") 
+		*ppProcAddress = (void*) &libmcdriver_scanlaboie_injectcomponent;
+	if (sProcName == "libmcdriver_scanlaboie_getsymbollookupmethod") 
+		*ppProcAddress = (void*) &libmcdriver_scanlaboie_getsymbollookupmethod;
+	if (sProcName == "libmcdriver_scanlaboie_createdriver") 
+		*ppProcAddress = (void*) &libmcdriver_scanlaboie_createdriver;
+	
+	if (*ppProcAddress == nullptr) 
+		return LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+}
+
+/*************************************************************************************************************************
+ Global functions implementation
+**************************************************************************************************************************/
+LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_getversion(LibMCDriver_ScanLabOIE_uint32 * pMajor, LibMCDriver_ScanLabOIE_uint32 * pMinor, LibMCDriver_ScanLabOIE_uint32 * pMicro)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		if (!pMajor)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		if (!pMinor)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		if (!pMicro)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		CWrapper::GetVersion(*pMajor, *pMinor, *pMicro);
+
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+	catch (ELibMCDriver_ScanLabOIEInterfaceException & Exception) {
+		return handleLibMCDriver_ScanLabOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_getlasterror(LibMCDriver_ScanLabOIE_Base pInstance, const LibMCDriver_ScanLabOIE_uint32 nErrorMessageBufferSize, LibMCDriver_ScanLabOIE_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		if ( (!pErrorMessageBuffer) && !(pErrorMessageNeededChars) )
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		if (pHasError == nullptr)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		IBase* pIBaseClassInstance = (IBase *)pInstance;
+		IBase* pIInstance = dynamic_cast<IBase*>(pIBaseClassInstance);
+		if (!pIInstance)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST);
+		
+		std::string sErrorMessage("");
+		*pHasError = CWrapper::GetLastError(pIInstance, sErrorMessage);
+
+		if (pErrorMessageNeededChars)
+			*pErrorMessageNeededChars = (LibMCDriver_ScanLabOIE_uint32) (sErrorMessage.size()+1);
+		if (pErrorMessageBuffer) {
+			if (sErrorMessage.size() >= nErrorMessageBufferSize)
+				throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iErrorMessage = 0; iErrorMessage < sErrorMessage.size(); iErrorMessage++)
+				pErrorMessageBuffer[iErrorMessage] = sErrorMessage[iErrorMessage];
+			pErrorMessageBuffer[sErrorMessage.size()] = 0;
+		}
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+	catch (ELibMCDriver_ScanLabOIEInterfaceException & Exception) {
+		return handleLibMCDriver_ScanLabOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_releaseinstance(LibMCDriver_ScanLabOIE_Base pInstance)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		IBase* pIBaseClassInstance = (IBase *)pInstance;
+		IBase* pIInstance = dynamic_cast<IBase*>(pIBaseClassInstance);
+		if (!pIInstance)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST);
+		
+		CWrapper::ReleaseInstance(pIInstance);
+
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+	catch (ELibMCDriver_ScanLabOIEInterfaceException & Exception) {
+		return handleLibMCDriver_ScanLabOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_acquireinstance(LibMCDriver_ScanLabOIE_Base pInstance)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		IBase* pIBaseClassInstance = (IBase *)pInstance;
+		IBase* pIInstance = dynamic_cast<IBase*>(pIBaseClassInstance);
+		if (!pIInstance)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST);
+		
+		CWrapper::AcquireInstance(pIInstance);
+
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+	catch (ELibMCDriver_ScanLabOIEInterfaceException & Exception) {
+		return handleLibMCDriver_ScanLabOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_injectcomponent(const char * pNameSpace, LibMCDriver_ScanLabOIE_pvoid pSymbolAddressMethod)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		if (pNameSpace == nullptr)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		std::string sNameSpace(pNameSpace);
+		
+		bool bNameSpaceFound = false;
+		
+		if (sNameSpace == "LibMCDriverEnv") {
+			if (CWrapper::sPLibMCDriverEnvWrapper.get() != nullptr) {
+				throw ELibMCDriver_ScanLabOIEInterfaceException(LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTLOADLIBRARY);
+			}
+			CWrapper::sPLibMCDriverEnvWrapper = LibMCDriverEnv::CWrapper::loadLibraryFromSymbolLookupMethod(pSymbolAddressMethod);
+			bNameSpaceFound = true;
+		}
+		
+		if (!bNameSpaceFound)
+			throw ELibMCDriver_ScanLabOIEInterfaceException(LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTLOADLIBRARY);
+		
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+	catch (ELibMCDriver_ScanLabOIEInterfaceException & Exception) {
+		return handleLibMCDriver_ScanLabOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_getsymbollookupmethod(LibMCDriver_ScanLabOIE_pvoid * pSymbolLookupMethod)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		if (pSymbolLookupMethod == nullptr)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		*pSymbolLookupMethod = (void*)&LibMCDriver_ScanLabOIE::Impl::LibMCDriver_ScanLabOIE_GetProcAddress;
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+	catch (ELibMCDriver_ScanLabOIEInterfaceException & Exception) {
+		return handleLibMCDriver_ScanLabOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriver_ScanLabOIEResult libmcdriver_scanlaboie_createdriver(const char * pName, const char * pType, LibMCDriverEnv_DriverEnvironment pDriverEnvironment, LibMCDriver_ScanLabOIE_Driver * pInstance)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		if (pName == nullptr)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		if (pType == nullptr)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		if (pInstance == nullptr)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM);
+		std::string sName(pName);
+		std::string sType(pType);
+		LibMCDriverEnv::PDriverEnvironment pIDriverEnvironment = std::make_shared<LibMCDriverEnv::CDriverEnvironment>(CWrapper::sPLibMCDriverEnvWrapper.get(), pDriverEnvironment);
+		CWrapper::sPLibMCDriverEnvWrapper->AcquireInstance(pIDriverEnvironment.get());
+		if (!pIDriverEnvironment)
+			throw ELibMCDriver_ScanLabOIEInterfaceException (LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST);
+		
+		IBase* pBaseInstance(nullptr);
+		pBaseInstance = CWrapper::CreateDriver(sName, sType, pIDriverEnvironment);
+
+		*pInstance = (IBase*)(pBaseInstance);
+		return LIBMCDRIVER_SCANLABOIE_SUCCESS;
+	}
+	catch (ELibMCDriver_ScanLabOIEInterfaceException & Exception) {
+		return handleLibMCDriver_ScanLabOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
diff --git a/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_types.hpp b/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_types.hpp
new file mode 100644
index 00000000..a2e1c637
--- /dev/null
+++ b/Drivers/ScanLabOIE/Interfaces/libmcdriver_scanlaboie_types.hpp
@@ -0,0 +1,141 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file with basic types in
+order to allow an easy use of MC Driver ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDRIVER_SCANLABOIE_TYPES_HEADER_CPP
+#define __LIBMCDRIVER_SCANLABOIE_TYPES_HEADER_CPP
+
+
+/*************************************************************************************************************************
+ Scalar types definition
+**************************************************************************************************************************/
+
+#ifdef LIBMCDRIVER_SCANLABOIE_USELEGACYINTEGERTYPES
+
+typedef unsigned char LibMCDriver_ScanLabOIE_uint8;
+typedef unsigned short LibMCDriver_ScanLabOIE_uint16 ;
+typedef unsigned int LibMCDriver_ScanLabOIE_uint32;
+typedef unsigned long long LibMCDriver_ScanLabOIE_uint64;
+typedef char LibMCDriver_ScanLabOIE_int8;
+typedef short LibMCDriver_ScanLabOIE_int16;
+typedef int LibMCDriver_ScanLabOIE_int32;
+typedef long long LibMCDriver_ScanLabOIE_int64;
+
+#else // LIBMCDRIVER_SCANLABOIE_USELEGACYINTEGERTYPES
+
+#include <stdint.h>
+
+typedef uint8_t LibMCDriver_ScanLabOIE_uint8;
+typedef uint16_t LibMCDriver_ScanLabOIE_uint16;
+typedef uint32_t LibMCDriver_ScanLabOIE_uint32;
+typedef uint64_t LibMCDriver_ScanLabOIE_uint64;
+typedef int8_t LibMCDriver_ScanLabOIE_int8;
+typedef int16_t LibMCDriver_ScanLabOIE_int16;
+typedef int32_t LibMCDriver_ScanLabOIE_int32;
+typedef int64_t LibMCDriver_ScanLabOIE_int64 ;
+
+#endif // LIBMCDRIVER_SCANLABOIE_USELEGACYINTEGERTYPES
+
+typedef float LibMCDriver_ScanLabOIE_single;
+typedef double LibMCDriver_ScanLabOIE_double;
+
+/*************************************************************************************************************************
+ General type definitions
+**************************************************************************************************************************/
+
+typedef LibMCDriver_ScanLabOIE_int32 LibMCDriver_ScanLabOIEResult;
+typedef void * LibMCDriver_ScanLabOIEHandle;
+typedef void * LibMCDriver_ScanLabOIE_pvoid;
+
+/*************************************************************************************************************************
+ Version for LibMCDriver_ScanLabOIE
+**************************************************************************************************************************/
+
+#define LIBMCDRIVER_SCANLABOIE_VERSION_MAJOR 1
+#define LIBMCDRIVER_SCANLABOIE_VERSION_MINOR 0
+#define LIBMCDRIVER_SCANLABOIE_VERSION_MICRO 0
+#define LIBMCDRIVER_SCANLABOIE_VERSION_PRERELEASEINFO ""
+#define LIBMCDRIVER_SCANLABOIE_VERSION_BUILDINFO ""
+
+/*************************************************************************************************************************
+ Error constants for LibMCDriver_ScanLabOIE
+**************************************************************************************************************************/
+
+#define LIBMCDRIVER_SCANLABOIE_SUCCESS 0
+#define LIBMCDRIVER_SCANLABOIE_ERROR_NOTIMPLEMENTED 1
+#define LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM 2
+#define LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST 3
+#define LIBMCDRIVER_SCANLABOIE_ERROR_BUFFERTOOSMALL 4
+#define LIBMCDRIVER_SCANLABOIE_ERROR_GENERICEXCEPTION 5
+#define LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTLOADLIBRARY 6
+#define LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT 7
+#define LIBMCDRIVER_SCANLABOIE_ERROR_INCOMPATIBLEBINARYVERSION 8
+
+/*************************************************************************************************************************
+ Error strings for LibMCDriver_ScanLabOIE
+**************************************************************************************************************************/
+
+inline const char * LIBMCDRIVER_SCANLABOIE_GETERRORSTRING (LibMCDriver_ScanLabOIEResult nErrorCode) {
+  switch (nErrorCode) {
+    case LIBMCDRIVER_SCANLABOIE_SUCCESS: return "no error";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_NOTIMPLEMENTED: return "functionality not implemented";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDPARAM: return "an invalid parameter was passed";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_INVALIDCAST: return "a type cast failed";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_BUFFERTOOSMALL: return "a provided buffer is too small";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_GENERICEXCEPTION: return "a generic exception occurred";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTLOADLIBRARY: return "the library could not be loaded";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_COULDNOTFINDLIBRARYEXPORT: return "a required exported symbol could not be found in the library";
+    case LIBMCDRIVER_SCANLABOIE_ERROR_INCOMPATIBLEBINARYVERSION: return "the version of the binary interface does not match the bindings interface";
+    default: return "unknown error";
+  }
+}
+
+/*************************************************************************************************************************
+ Declaration of handle classes 
+**************************************************************************************************************************/
+
+typedef LibMCDriver_ScanLabOIEHandle LibMCDriver_ScanLabOIE_Base;
+typedef LibMCDriver_ScanLabOIEHandle LibMCDriver_ScanLabOIE_Driver;
+typedef LibMCDriver_ScanLabOIEHandle LibMCDriver_ScanLabOIE_Driver_ScanLab_OIE;
+
+namespace LibMCDriver_ScanLabOIE {
+
+} // namespace LibMCDriver_ScanLabOIE;
+
+// define legacy C-names for enums, structs and function types
+
+#endif // __LIBMCDRIVER_SCANLABOIE_TYPES_HEADER_CPP
diff --git a/Drivers/ScanLabOIE/LibOIE/CMakeLists.txt b/Drivers/ScanLabOIE/LibOIE/CMakeLists.txt
new file mode 100644
index 00000000..309fd867
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/CMakeLists.txt
@@ -0,0 +1,84 @@
+#[[++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+]]
+
+
+cmake_minimum_required(VERSION 3.5)
+
+project(LibOIE)
+
+if(NOT APPLE)
+  find_library(LIB_OPENSSL NAMES crypto ssl)
+  if(LIB_OPENSSL)
+    add_definitions(-DBRYNET_USE_OPENSSL)
+    SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-as-needed -ldl -lrt -lssl -lcrypto")
+  elseif()
+    message("not found openssl")
+  endif()
+endif()
+
+
+if(WIN32)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest")
+elseif(UNIX)
+    if(NOT CMAKE_BUILD_TYPE)
+      set(CMAKE_BUILD_TYPE "Release")
+    endif()
+    SET(CMAKE_CXX_FLAGS_DEBUG   "-O0 -g -ggdb -Wall -Wextra -D_DEBUG")
+    SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -ggdb -Wall -Wextra -DNDEBUG")
+  if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+  else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+  endif()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+  set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fPIC")
+endif()
+
+file(GLOB LIBOIE_SRC
+	${CMAKE_CURRENT_SOURCE_DIR}/Implementation/*.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/Interfaces/*.cpp
+)
+
+add_library(liboie SHARED ${LIBOIE_SRC})
+# Do not prefix the binary's name with "lib" on Unix systems:
+set_target_properties(liboie PROPERTIES PREFIX "" IMPORT_PREFIX "" )
+# The following two properties are crucial to reduce the number of undesirably exported symbols
+set_target_properties(liboie PROPERTIES CXX_VISIBILITY_PRESET hidden)
+set_target_properties(liboie PROPERTIES VISIBILITY_INLINES_HIDDEN ON)
+# This makes sure symbols are exported
+target_compile_options(liboie PRIVATE "-D__LIBOIE_EXPORTS")
+target_include_directories(liboie PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Implementation)
+target_include_directories(liboie PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Interfaces)
+target_include_directories(liboie PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Libraries)
+
+IF(WIN32)
+	target_link_libraries(liboie Ws2_32.lib)
+ENDIF(WIN32)
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Headers/CppDynamic/liboie_abi.hpp b/Drivers/ScanLabOIE/LibOIE/Headers/CppDynamic/liboie_abi.hpp
new file mode 100644
index 00000000..6aee6dc5
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Headers/CppDynamic/liboie_abi.hpp
@@ -0,0 +1,576 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file in order to allow an easy
+ use of ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBOIE_HEADER_CPP
+#define __LIBOIE_HEADER_CPP
+
+#ifdef __LIBOIE_EXPORTS
+#ifdef _WIN32
+#define LIBOIE_DECLSPEC __declspec (dllexport)
+#else // _WIN32
+#define LIBOIE_DECLSPEC __attribute__((visibility("default")))
+#endif // _WIN32
+#else // __LIBOIE_EXPORTS
+#define LIBOIE_DECLSPEC
+#endif // __LIBOIE_EXPORTS
+
+#include "liboie_types.hpp"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*************************************************************************************************************************
+ Class definition for Base
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for Iterator
+**************************************************************************************************************************/
+
+/**
+* Iterates to the next resource in the list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pHasNext - Iterates to the next resource in the list.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_iterator_movenext(LibOIE_Iterator pIterator, bool * pHasNext);
+
+/**
+* Iterates to the previous resource in the list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pHasPrevious - Iterates to the previous resource in the list.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_iterator_moveprevious(LibOIE_Iterator pIterator, bool * pHasPrevious);
+
+/**
+* Returns the resource the iterator points at.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pCurrentInstance - returns the resource instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_iterator_getcurrent(LibOIE_Iterator pIterator, LibOIE_Base * pCurrentInstance);
+
+/**
+* Creates a new resource iterator with the same resource list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pOutIterator - returns the cloned Iterator instance
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_iterator_clone(LibOIE_Iterator pIterator, LibOIE_Iterator * pOutIterator);
+
+/**
+* Returns the number of resoucres the iterator captures.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pCount - returns the number of resources the iterator captures.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_iterator_count(LibOIE_Iterator pIterator, LibOIE_uint64 * pCount);
+
+/*************************************************************************************************************************
+ Class definition for DataPackage
+**************************************************************************************************************************/
+
+/**
+* Returns the raw payload.
+*
+* @param[in] pDataPackage - DataPackage instance.
+* @param[in] nPayloadBufferSize - Number of elements in buffer
+* @param[out] pPayloadNeededCount - will be filled with the count of the written elements, or needed buffer size.
+* @param[out] pPayloadBuffer - uint8 buffer of Raw payload data.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_datapackage_getrawpayload(LibOIE_DataPackage pDataPackage, const LibOIE_uint64 nPayloadBufferSize, LibOIE_uint64* pPayloadNeededCount, LibOIE_uint8 * pPayloadBuffer);
+
+/**
+* Releases memory of the data package.
+*
+* @param[in] pDataPackage - DataPackage instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_datapackage_release(LibOIE_DataPackage pDataPackage);
+
+/*************************************************************************************************************************
+ Class definition for PyroDataPackage
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for PyroDataPackageIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the data package the iterator points at.
+*
+* @param[in] pPyroDataPackageIterator - PyroDataPackageIterator instance.
+* @param[out] pCurrentInstance - returns the data package instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_pyrodatapackageiterator_getcurrentpyrodatapackage(LibOIE_PyroDataPackageIterator pPyroDataPackageIterator, LibOIE_PyroDataPackage * pCurrentInstance);
+
+/*************************************************************************************************************************
+ Class definition for OctDataPackage
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for OctDataPackageIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the data package the iterator points at.
+*
+* @param[in] pOctDataPackageIterator - OctDataPackageIterator instance.
+* @param[out] pCurrentInstance - returns the data package instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_octdatapackageiterator_getcurrentoctdatapackage(LibOIE_OctDataPackageIterator pOctDataPackageIterator, LibOIE_OctDataPackage * pCurrentInstance);
+
+/*************************************************************************************************************************
+ Class definition for RemoteFunctionCall
+**************************************************************************************************************************/
+
+/**
+* Returns function name
+*
+* @param[in] pRemoteFunctionCall - RemoteFunctionCall instance.
+* @param[in] nFunctionNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFunctionNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFunctionNameBuffer -  buffer of Function Name., may be NULL
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_remotefunctioncall_getfunctionname(LibOIE_RemoteFunctionCall pRemoteFunctionCall, const LibOIE_uint32 nFunctionNameBufferSize, LibOIE_uint32* pFunctionNameNeededChars, char * pFunctionNameBuffer);
+
+/**
+* Adds a function call parameter
+*
+* @param[in] pRemoteFunctionCall - RemoteFunctionCall instance.
+* @param[in] pParameter - Parameter of the call.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_remotefunctioncall_addparameter(LibOIE_RemoteFunctionCall pRemoteFunctionCall, const char * pParameter);
+
+/**
+* Sends a remote function call over its connection.
+*
+* @param[in] pRemoteFunctionCall - RemoteFunctionCall instance.
+* @param[in] nResultStringBufferSize - size of the buffer (including trailing 0)
+* @param[out] pResultStringNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pResultStringBuffer -  buffer of Returns result if successful., may be NULL
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_remotefunctioncall_send(LibOIE_RemoteFunctionCall pRemoteFunctionCall, const LibOIE_uint32 nResultStringBufferSize, LibOIE_uint32* pResultStringNeededChars, char * pResultStringBuffer);
+
+/*************************************************************************************************************************
+ Class definition for Connection
+**************************************************************************************************************************/
+
+/**
+* Disconnects and closes the connection
+*
+* @param[in] pConnection - Connection instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_disconnect(LibOIE_Connection pConnection);
+
+/**
+* Sets timeout value for each poll request below.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nTimeout - Timeout in milliseconds. Default is 1000ms. Minimum 10ms, maximum 1000000ms.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_setrequesttimeout(LibOIE_Connection pConnection, LibOIE_uint32 nTimeout);
+
+/**
+* Sets the maximum error messages that can be received before the connection is terminated.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nErrorCount - Max Error count. Default is 1024. Minimum 16, maximum 65535.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_setmaxerrorcount(LibOIE_Connection pConnection, LibOIE_uint32 nErrorCount);
+
+/**
+* Sets the maximum memory buffer the data packets can use before the connection is terminated.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nMaxMemoryCount - Max memory count in bytes. Default is 1MB. Minimum 1kB, maximum 1GB.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_setmaxmemorycount(LibOIE_Connection pConnection, LibOIE_uint32 nMaxMemoryCount);
+
+/**
+* Sets a temporary filename to which the packets are buffered.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFileName - Filename which should be used as buffer.
+* @param[in] nMaxMemoryCount - Max memory count in bytes. Default is 1MB. Minimum 1kB, maximum 1TB.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_setbufferfile(LibOIE_Connection pConnection, const char * pFileName, LibOIE_uint64 nMaxMemoryCount);
+
+/**
+* Stops writing to disk.
+*
+* @param[in] pConnection - Connection instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_unsetbufferfile(LibOIE_Connection pConnection);
+
+/**
+* Sets check alive interval. 0ms means no check alive request is sent.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nCheckAliveInterval - Timeout in milliseconds. Default is 1000ms. Max value is 1000000ms.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_setcheckaliveinterval(LibOIE_Connection pConnection, LibOIE_uint32 nCheckAliveInterval);
+
+/**
+* Retrieves Firmware Version. Fails if firmware is not existing.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFirmwareName - Name of the firmware to retrieve.
+* @param[in] nFirmwareVersionBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFirmwareVersionNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFirmwareVersionBuffer -  buffer of Version of the requested firmware., may be NULL
+* @param[in] nFilenameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFilenameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFilenameBuffer -  buffer of Filename of the requested firmware., may be NULL
+* @param[in] nFiledateBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFiledateNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFiledateBuffer -  buffer of Timestamp of the requested firmware in ISO8601 Time., may be NULL
+* @param[in] nSHA256BufferSize - size of the buffer (including trailing 0)
+* @param[out] pSHA256NeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pSHA256Buffer -  buffer of Checksum of the requested firmware., may be NULL
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_retrievefirmwareversion(LibOIE_Connection pConnection, const char * pFirmwareName, const LibOIE_uint32 nFirmwareVersionBufferSize, LibOIE_uint32* pFirmwareVersionNeededChars, char * pFirmwareVersionBuffer, const LibOIE_uint32 nFilenameBufferSize, LibOIE_uint32* pFilenameNeededChars, char * pFilenameBuffer, const LibOIE_uint32 nFiledateBufferSize, LibOIE_uint32* pFiledateNeededChars, char * pFiledateBuffer, const LibOIE_uint32 nSHA256BufferSize, LibOIE_uint32* pSHA256NeededChars, char * pSHA256Buffer);
+
+/**
+* Retrieves Firmware Version. Fails if firmware is not existing.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFirmwareName - Name of the new firmware.
+* @param[in] pFirmwareVersion - Version of the new firmware.
+* @param[in] pFileName - Filename of the new firmware.
+* @param[in] pFileDate - Timestamp of the requested firmware in ISO8601 Time.
+* @param[in] pSHA256 - Checksum of the new firmware.
+* @param[in] nBinaryDataBufferSize - Number of elements in buffer
+* @param[in] pBinaryDataBuffer - uint8 buffer of Blob of new firmware.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_updatefirmware(LibOIE_Connection pConnection, const char * pFirmwareName, const char * pFirmwareVersion, const char * pFileName, const char * pFileDate, const char * pSHA256, LibOIE_uint64 nBinaryDataBufferSize, const LibOIE_uint8 * pBinaryDataBuffer);
+
+/**
+* Starts firmware on Open Interface Extension.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFileName - Filename of the firmware to start.
+* @param[out] pSuccess - Firmware successfully started.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_startfirmware(LibOIE_Connection pConnection, const char * pFileName, bool * pSuccess);
+
+/**
+* Stops firmware on Open Interface Extension.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFileName - Filename of the firmware to stop.
+* @param[out] pSuccess - Firmware successfully stopped.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_stopfirmware(LibOIE_Connection pConnection, const char * pFileName, bool * pSuccess);
+
+/**
+* sets a callback that triggers when a connection error occured.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pCallback - callback pointer.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_setconnectionerrorcallback(LibOIE_Connection pConnection, LibOIE::ConnectionErrorCallback pCallback);
+
+/**
+* clears the error log.
+*
+* @param[in] pConnection - Connection instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_clearerrors(LibOIE_Connection pConnection);
+
+/**
+* Returns the list of errors in the error log.
+*
+* @param[in] pConnection - Connection instance.
+* @param[out] pErrorCount - Errors in the error log.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_geterrorcount(LibOIE_Connection pConnection, LibOIE_uint32 * pErrorCount);
+
+/**
+* Returns an error message of the error log
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nErrorIndex - Index of the error.
+* @param[in] nErrorMessageBufferSize - size of the buffer (including trailing 0)
+* @param[out] pErrorMessageNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pErrorMessageBuffer -  buffer of Message of the error., may be NULL
+* @param[in] nTimestampBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTimestampNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTimestampBuffer -  buffer of ISO8601 Time when the error was reported., may be NULL
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_geterror(LibOIE_Connection pConnection, LibOIE_uint32 nErrorIndex, const LibOIE_uint32 nErrorMessageBufferSize, LibOIE_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, const LibOIE_uint32 nTimestampBufferSize, LibOIE_uint32* pTimestampNeededChars, char * pTimestampBuffer);
+
+/**
+* Creates a new remote function call.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFunctionName - Function name.
+* @param[out] pInstance - Function call instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_createremotefunctioncall(LibOIE_Connection pConnection, const char * pFunctionName, LibOIE_RemoteFunctionCall * pInstance);
+
+/**
+* Retrieves currently buffered pyro packages.
+*
+* @param[in] pConnection - Connection instance.
+* @param[out] pIterator - Iterator of buffered packages.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_getbufferedpyropackages(LibOIE_Connection pConnection, LibOIE_PyroDataPackageIterator * pIterator);
+
+/**
+* Retrieves currently buffered oct packages.
+*
+* @param[in] pConnection - Connection instance.
+* @param[out] pIterator - Iterator of buffered packages.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_getbufferedoctpackages(LibOIE_Connection pConnection, LibOIE_OctDataPackageIterator * pIterator);
+
+/*************************************************************************************************************************
+ Class definition for ConnectionIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the connection the iterator points at.
+*
+* @param[in] pConnectionIterator - ConnectionIterator instance.
+* @param[out] pCurrentInstance - returns the connection instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connectioniterator_getcurrentconnection(LibOIE_ConnectionIterator pConnectionIterator, LibOIE_Connection * pCurrentInstance);
+
+/*************************************************************************************************************************
+ Class definition for Server
+**************************************************************************************************************************/
+
+/**
+* starts listening for connections.
+*
+* @param[in] pServer - Server instance.
+* @param[in] pIPAddress - IP Address to run on
+* @param[in] nPort - Port to run on
+* @param[in] bIPv6 - flag if IPv6 should be used
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_start(LibOIE_Server pServer, const char * pIPAddress, LibOIE_uint32 nPort, bool bIPv6);
+
+/**
+* stops listening for connections and disconnects existing ones.
+*
+* @param[in] pServer - Server instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_stop(LibOIE_Server pServer);
+
+/**
+* disconnects all connections but does not stop listening.
+*
+* @param[in] pServer - Server instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_closeallconnections(LibOIE_Server pServer);
+
+/**
+* sets the maximum thread count to use. Must be called before Start
+*
+* @param[in] pServer - Server instance.
+* @param[in] nThreadCount - Thread count to use (must be larger than 4, default is 32)
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_setthreadcount(LibOIE_Server pServer, LibOIE_uint32 nThreadCount);
+
+/**
+* sets the receive buffer size
+*
+* @param[in] pServer - Server instance.
+* @param[in] nRCVBufferSize - Receive buffer size to use in bytes (must be between 4kB and 1GB, default is 1MB)
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_setbuffersize(LibOIE_Server pServer, LibOIE_uint32 nRCVBufferSize);
+
+/**
+* adds an accepted device
+*
+* @param[in] pServer - Server instance.
+* @param[in] pDeviceName - Device name to be accepted. Empty string means all devices.
+* @param[in] pApplicationName - Application name to be accepted. Empty string means all applications.
+* @param[in] pVersionName - Version name to be accepted. Empty string means all versions.
+* @param[out] pRuleID - Returns identifier of acceptance rule.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_acceptdevice(LibOIE_Server pServer, const char * pDeviceName, const char * pApplicationName, const char * pVersionName, LibOIE_uint32 * pRuleID);
+
+/**
+* removes an accepted
+*
+* @param[in] pServer - Server instance.
+* @param[in] nRuleID - identifier of acceptance rule.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_unacceptdevice(LibOIE_Server pServer, LibOIE_uint32 nRuleID);
+
+/**
+* clears all accepted device rules
+*
+* @param[in] pServer - Server instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_clearaccepteddevices(LibOIE_Server pServer);
+
+/**
+* lists all open connections
+*
+* @param[in] pServer - Server instance.
+* @param[out] pConnectionIteratorInstance - list of all open connections.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_listconnections(LibOIE_Server pServer, LibOIE_ConnectionIterator * pConnectionIteratorInstance);
+
+/**
+* sets a callback that triggers when a new connection was established.
+*
+* @param[in] pServer - Server instance.
+* @param[in] pCallback - callback pointer.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_setconnectionacceptedcallback(LibOIE_Server pServer, LibOIE::ConnectionAcceptedCallback pCallback);
+
+/**
+* sets a callback that triggers when a new connection was rejected.
+*
+* @param[in] pServer - Server instance.
+* @param[in] pCallback - callback pointer.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_setconnectionrejectedcallback(LibOIE_Server pServer, LibOIE::ConnectionRejectedCallback pCallback);
+
+/*************************************************************************************************************************
+ Global functions
+**************************************************************************************************************************/
+
+/**
+* retrieves the binary version of this library.
+*
+* @param[out] pMajor - returns the major version of this library
+* @param[out] pMinor - returns the minor version of this library
+* @param[out] pMicro - returns the micro version of this library
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_getversion(LibOIE_uint32 * pMajor, LibOIE_uint32 * pMinor, LibOIE_uint32 * pMicro);
+
+/**
+* Returns the last error recorded on this object
+*
+* @param[in] pInstance - Instance Handle
+* @param[in] nErrorMessageBufferSize - size of the buffer (including trailing 0)
+* @param[out] pErrorMessageNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pErrorMessageBuffer -  buffer of Message of the last error, may be NULL
+* @param[out] pHasError - Is there a last error to query
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_getlasterror(LibOIE_Base pInstance, const LibOIE_uint32 nErrorMessageBufferSize, LibOIE_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError);
+
+/**
+* Releases shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_releaseinstance(LibOIE_Base pInstance);
+
+/**
+* Acquires shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_acquireinstance(LibOIE_Base pInstance);
+
+/**
+* Returns the address of the SymbolLookupMethod
+*
+* @param[out] pSymbolLookupMethod - Address of the SymbolAddressMethod
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_getsymbollookupmethod(LibOIE_pvoid * pSymbolLookupMethod);
+
+/**
+* Creates a open interface extension server instance.
+*
+* @param[out] pInstance - New Server instance
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_createserver(LibOIE_Server * pInstance);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __LIBOIE_HEADER_CPP
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Headers/CppDynamic/liboie_dynamic.h b/Drivers/ScanLabOIE/LibOIE/Headers/CppDynamic/liboie_dynamic.h
new file mode 100644
index 00000000..dbb0a501
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Headers/CppDynamic/liboie_dynamic.h
@@ -0,0 +1,615 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file in order to allow an easy
+ use of ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBOIE_DYNAMICHEADER_CPPTYPES
+#define __LIBOIE_DYNAMICHEADER_CPPTYPES
+
+#include "liboie_types.hpp"
+
+
+
+/*************************************************************************************************************************
+ Class definition for Base
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for Iterator
+**************************************************************************************************************************/
+
+/**
+* Iterates to the next resource in the list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pHasNext - Iterates to the next resource in the list.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEIterator_MoveNextPtr) (LibOIE_Iterator pIterator, bool * pHasNext);
+
+/**
+* Iterates to the previous resource in the list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pHasPrevious - Iterates to the previous resource in the list.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEIterator_MovePreviousPtr) (LibOIE_Iterator pIterator, bool * pHasPrevious);
+
+/**
+* Returns the resource the iterator points at.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pCurrentInstance - returns the resource instance.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEIterator_GetCurrentPtr) (LibOIE_Iterator pIterator, LibOIE_Base * pCurrentInstance);
+
+/**
+* Creates a new resource iterator with the same resource list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pOutIterator - returns the cloned Iterator instance
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEIterator_ClonePtr) (LibOIE_Iterator pIterator, LibOIE_Iterator * pOutIterator);
+
+/**
+* Returns the number of resoucres the iterator captures.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pCount - returns the number of resources the iterator captures.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEIterator_CountPtr) (LibOIE_Iterator pIterator, LibOIE_uint64 * pCount);
+
+/*************************************************************************************************************************
+ Class definition for DataPackage
+**************************************************************************************************************************/
+
+/**
+* Returns the raw payload.
+*
+* @param[in] pDataPackage - DataPackage instance.
+* @param[in] nPayloadBufferSize - Number of elements in buffer
+* @param[out] pPayloadNeededCount - will be filled with the count of the written elements, or needed buffer size.
+* @param[out] pPayloadBuffer - uint8 buffer of Raw payload data.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEDataPackage_GetRawPayloadPtr) (LibOIE_DataPackage pDataPackage, const LibOIE_uint64 nPayloadBufferSize, LibOIE_uint64* pPayloadNeededCount, LibOIE_uint8 * pPayloadBuffer);
+
+/**
+* Releases memory of the data package.
+*
+* @param[in] pDataPackage - DataPackage instance.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEDataPackage_ReleasePtr) (LibOIE_DataPackage pDataPackage);
+
+/*************************************************************************************************************************
+ Class definition for PyroDataPackage
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for PyroDataPackageIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the data package the iterator points at.
+*
+* @param[in] pPyroDataPackageIterator - PyroDataPackageIterator instance.
+* @param[out] pCurrentInstance - returns the data package instance.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEPyroDataPackageIterator_GetCurrentPyroDataPackagePtr) (LibOIE_PyroDataPackageIterator pPyroDataPackageIterator, LibOIE_PyroDataPackage * pCurrentInstance);
+
+/*************************************************************************************************************************
+ Class definition for OctDataPackage
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for OctDataPackageIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the data package the iterator points at.
+*
+* @param[in] pOctDataPackageIterator - OctDataPackageIterator instance.
+* @param[out] pCurrentInstance - returns the data package instance.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEOctDataPackageIterator_GetCurrentOctDataPackagePtr) (LibOIE_OctDataPackageIterator pOctDataPackageIterator, LibOIE_OctDataPackage * pCurrentInstance);
+
+/*************************************************************************************************************************
+ Class definition for RemoteFunctionCall
+**************************************************************************************************************************/
+
+/**
+* Returns function name
+*
+* @param[in] pRemoteFunctionCall - RemoteFunctionCall instance.
+* @param[in] nFunctionNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFunctionNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFunctionNameBuffer -  buffer of Function Name., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIERemoteFunctionCall_GetFunctionNamePtr) (LibOIE_RemoteFunctionCall pRemoteFunctionCall, const LibOIE_uint32 nFunctionNameBufferSize, LibOIE_uint32* pFunctionNameNeededChars, char * pFunctionNameBuffer);
+
+/**
+* Adds a function call parameter
+*
+* @param[in] pRemoteFunctionCall - RemoteFunctionCall instance.
+* @param[in] pParameter - Parameter of the call.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIERemoteFunctionCall_AddParameterPtr) (LibOIE_RemoteFunctionCall pRemoteFunctionCall, const char * pParameter);
+
+/**
+* Sends a remote function call over its connection.
+*
+* @param[in] pRemoteFunctionCall - RemoteFunctionCall instance.
+* @param[in] nResultStringBufferSize - size of the buffer (including trailing 0)
+* @param[out] pResultStringNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pResultStringBuffer -  buffer of Returns result if successful., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIERemoteFunctionCall_SendPtr) (LibOIE_RemoteFunctionCall pRemoteFunctionCall, const LibOIE_uint32 nResultStringBufferSize, LibOIE_uint32* pResultStringNeededChars, char * pResultStringBuffer);
+
+/*************************************************************************************************************************
+ Class definition for Connection
+**************************************************************************************************************************/
+
+/**
+* Disconnects and closes the connection
+*
+* @param[in] pConnection - Connection instance.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_DisconnectPtr) (LibOIE_Connection pConnection);
+
+/**
+* Sets timeout value for each poll request below.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nTimeout - Timeout in milliseconds. Default is 1000ms. Minimum 10ms, maximum 1000000ms.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_SetRequestTimeoutPtr) (LibOIE_Connection pConnection, LibOIE_uint32 nTimeout);
+
+/**
+* Sets the maximum error messages that can be received before the connection is terminated.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nErrorCount - Max Error count. Default is 1024. Minimum 16, maximum 65535.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_SetMaxErrorCountPtr) (LibOIE_Connection pConnection, LibOIE_uint32 nErrorCount);
+
+/**
+* Sets the maximum memory buffer the data packets can use before the connection is terminated.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nMaxMemoryCount - Max memory count in bytes. Default is 1MB. Minimum 1kB, maximum 1GB.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_SetMaxMemoryCountPtr) (LibOIE_Connection pConnection, LibOIE_uint32 nMaxMemoryCount);
+
+/**
+* Sets a temporary filename to which the packets are buffered.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFileName - Filename which should be used as buffer.
+* @param[in] nMaxMemoryCount - Max memory count in bytes. Default is 1MB. Minimum 1kB, maximum 1TB.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_SetBufferFilePtr) (LibOIE_Connection pConnection, const char * pFileName, LibOIE_uint64 nMaxMemoryCount);
+
+/**
+* Stops writing to disk.
+*
+* @param[in] pConnection - Connection instance.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_UnsetBufferFilePtr) (LibOIE_Connection pConnection);
+
+/**
+* Sets check alive interval. 0ms means no check alive request is sent.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nCheckAliveInterval - Timeout in milliseconds. Default is 1000ms. Max value is 1000000ms.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_SetCheckAliveIntervalPtr) (LibOIE_Connection pConnection, LibOIE_uint32 nCheckAliveInterval);
+
+/**
+* Retrieves Firmware Version. Fails if firmware is not existing.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFirmwareName - Name of the firmware to retrieve.
+* @param[in] nFirmwareVersionBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFirmwareVersionNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFirmwareVersionBuffer -  buffer of Version of the requested firmware., may be NULL
+* @param[in] nFilenameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFilenameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFilenameBuffer -  buffer of Filename of the requested firmware., may be NULL
+* @param[in] nFiledateBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFiledateNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFiledateBuffer -  buffer of Timestamp of the requested firmware in ISO8601 Time., may be NULL
+* @param[in] nSHA256BufferSize - size of the buffer (including trailing 0)
+* @param[out] pSHA256NeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pSHA256Buffer -  buffer of Checksum of the requested firmware., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_RetrieveFirmwareVersionPtr) (LibOIE_Connection pConnection, const char * pFirmwareName, const LibOIE_uint32 nFirmwareVersionBufferSize, LibOIE_uint32* pFirmwareVersionNeededChars, char * pFirmwareVersionBuffer, const LibOIE_uint32 nFilenameBufferSize, LibOIE_uint32* pFilenameNeededChars, char * pFilenameBuffer, const LibOIE_uint32 nFiledateBufferSize, LibOIE_uint32* pFiledateNeededChars, char * pFiledateBuffer, const LibOIE_uint32 nSHA256BufferSize, LibOIE_uint32* pSHA256NeededChars, char * pSHA256Buffer);
+
+/**
+* Retrieves Firmware Version. Fails if firmware is not existing.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFirmwareName - Name of the new firmware.
+* @param[in] pFirmwareVersion - Version of the new firmware.
+* @param[in] pFileName - Filename of the new firmware.
+* @param[in] pFileDate - Timestamp of the requested firmware in ISO8601 Time.
+* @param[in] pSHA256 - Checksum of the new firmware.
+* @param[in] nBinaryDataBufferSize - Number of elements in buffer
+* @param[in] pBinaryDataBuffer - uint8 buffer of Blob of new firmware.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_UpdateFirmwarePtr) (LibOIE_Connection pConnection, const char * pFirmwareName, const char * pFirmwareVersion, const char * pFileName, const char * pFileDate, const char * pSHA256, LibOIE_uint64 nBinaryDataBufferSize, const LibOIE_uint8 * pBinaryDataBuffer);
+
+/**
+* Starts firmware on Open Interface Extension.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFileName - Filename of the firmware to start.
+* @param[out] pSuccess - Firmware successfully started.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_StartFirmwarePtr) (LibOIE_Connection pConnection, const char * pFileName, bool * pSuccess);
+
+/**
+* Stops firmware on Open Interface Extension.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFileName - Filename of the firmware to stop.
+* @param[out] pSuccess - Firmware successfully stopped.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_StopFirmwarePtr) (LibOIE_Connection pConnection, const char * pFileName, bool * pSuccess);
+
+/**
+* sets a callback that triggers when a connection error occured.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pCallback - callback pointer.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_SetConnectionErrorCallbackPtr) (LibOIE_Connection pConnection, LibOIE::ConnectionErrorCallback pCallback);
+
+/**
+* clears the error log.
+*
+* @param[in] pConnection - Connection instance.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_ClearErrorsPtr) (LibOIE_Connection pConnection);
+
+/**
+* Returns the list of errors in the error log.
+*
+* @param[in] pConnection - Connection instance.
+* @param[out] pErrorCount - Errors in the error log.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_GetErrorCountPtr) (LibOIE_Connection pConnection, LibOIE_uint32 * pErrorCount);
+
+/**
+* Returns an error message of the error log
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nErrorIndex - Index of the error.
+* @param[in] nErrorMessageBufferSize - size of the buffer (including trailing 0)
+* @param[out] pErrorMessageNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pErrorMessageBuffer -  buffer of Message of the error., may be NULL
+* @param[in] nTimestampBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTimestampNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTimestampBuffer -  buffer of ISO8601 Time when the error was reported., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_GetErrorPtr) (LibOIE_Connection pConnection, LibOIE_uint32 nErrorIndex, const LibOIE_uint32 nErrorMessageBufferSize, LibOIE_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, const LibOIE_uint32 nTimestampBufferSize, LibOIE_uint32* pTimestampNeededChars, char * pTimestampBuffer);
+
+/**
+* Creates a new remote function call.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFunctionName - Function name.
+* @param[out] pInstance - Function call instance.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_CreateRemoteFunctionCallPtr) (LibOIE_Connection pConnection, const char * pFunctionName, LibOIE_RemoteFunctionCall * pInstance);
+
+/**
+* Retrieves currently buffered pyro packages.
+*
+* @param[in] pConnection - Connection instance.
+* @param[out] pIterator - Iterator of buffered packages.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_GetBufferedPyroPackagesPtr) (LibOIE_Connection pConnection, LibOIE_PyroDataPackageIterator * pIterator);
+
+/**
+* Retrieves currently buffered oct packages.
+*
+* @param[in] pConnection - Connection instance.
+* @param[out] pIterator - Iterator of buffered packages.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnection_GetBufferedOctPackagesPtr) (LibOIE_Connection pConnection, LibOIE_OctDataPackageIterator * pIterator);
+
+/*************************************************************************************************************************
+ Class definition for ConnectionIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the connection the iterator points at.
+*
+* @param[in] pConnectionIterator - ConnectionIterator instance.
+* @param[out] pCurrentInstance - returns the connection instance.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEConnectionIterator_GetCurrentConnectionPtr) (LibOIE_ConnectionIterator pConnectionIterator, LibOIE_Connection * pCurrentInstance);
+
+/*************************************************************************************************************************
+ Class definition for Server
+**************************************************************************************************************************/
+
+/**
+* starts listening for connections.
+*
+* @param[in] pServer - Server instance.
+* @param[in] pIPAddress - IP Address to run on
+* @param[in] nPort - Port to run on
+* @param[in] bIPv6 - flag if IPv6 should be used
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEServer_StartPtr) (LibOIE_Server pServer, const char * pIPAddress, LibOIE_uint32 nPort, bool bIPv6);
+
+/**
+* stops listening for connections and disconnects existing ones.
+*
+* @param[in] pServer - Server instance.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEServer_StopPtr) (LibOIE_Server pServer);
+
+/**
+* disconnects all connections but does not stop listening.
+*
+* @param[in] pServer - Server instance.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEServer_CloseAllConnectionsPtr) (LibOIE_Server pServer);
+
+/**
+* sets the maximum thread count to use. Must be called before Start
+*
+* @param[in] pServer - Server instance.
+* @param[in] nThreadCount - Thread count to use (must be larger than 4, default is 32)
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEServer_SetThreadCountPtr) (LibOIE_Server pServer, LibOIE_uint32 nThreadCount);
+
+/**
+* sets the receive buffer size
+*
+* @param[in] pServer - Server instance.
+* @param[in] nRCVBufferSize - Receive buffer size to use in bytes (must be between 4kB and 1GB, default is 1MB)
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEServer_SetBufferSizePtr) (LibOIE_Server pServer, LibOIE_uint32 nRCVBufferSize);
+
+/**
+* adds an accepted device
+*
+* @param[in] pServer - Server instance.
+* @param[in] pDeviceName - Device name to be accepted. Empty string means all devices.
+* @param[in] pApplicationName - Application name to be accepted. Empty string means all applications.
+* @param[in] pVersionName - Version name to be accepted. Empty string means all versions.
+* @param[out] pRuleID - Returns identifier of acceptance rule.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEServer_AcceptDevicePtr) (LibOIE_Server pServer, const char * pDeviceName, const char * pApplicationName, const char * pVersionName, LibOIE_uint32 * pRuleID);
+
+/**
+* removes an accepted
+*
+* @param[in] pServer - Server instance.
+* @param[in] nRuleID - identifier of acceptance rule.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEServer_UnAcceptDevicePtr) (LibOIE_Server pServer, LibOIE_uint32 nRuleID);
+
+/**
+* clears all accepted device rules
+*
+* @param[in] pServer - Server instance.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEServer_ClearAcceptedDevicesPtr) (LibOIE_Server pServer);
+
+/**
+* lists all open connections
+*
+* @param[in] pServer - Server instance.
+* @param[out] pConnectionIteratorInstance - list of all open connections.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEServer_ListConnectionsPtr) (LibOIE_Server pServer, LibOIE_ConnectionIterator * pConnectionIteratorInstance);
+
+/**
+* sets a callback that triggers when a new connection was established.
+*
+* @param[in] pServer - Server instance.
+* @param[in] pCallback - callback pointer.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEServer_SetConnectionAcceptedCallbackPtr) (LibOIE_Server pServer, LibOIE::ConnectionAcceptedCallback pCallback);
+
+/**
+* sets a callback that triggers when a new connection was rejected.
+*
+* @param[in] pServer - Server instance.
+* @param[in] pCallback - callback pointer.
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEServer_SetConnectionRejectedCallbackPtr) (LibOIE_Server pServer, LibOIE::ConnectionRejectedCallback pCallback);
+
+/*************************************************************************************************************************
+ Global functions
+**************************************************************************************************************************/
+
+/**
+* retrieves the binary version of this library.
+*
+* @param[out] pMajor - returns the major version of this library
+* @param[out] pMinor - returns the minor version of this library
+* @param[out] pMicro - returns the micro version of this library
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEGetVersionPtr) (LibOIE_uint32 * pMajor, LibOIE_uint32 * pMinor, LibOIE_uint32 * pMicro);
+
+/**
+* Returns the last error recorded on this object
+*
+* @param[in] pInstance - Instance Handle
+* @param[in] nErrorMessageBufferSize - size of the buffer (including trailing 0)
+* @param[out] pErrorMessageNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pErrorMessageBuffer -  buffer of Message of the last error, may be NULL
+* @param[out] pHasError - Is there a last error to query
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEGetLastErrorPtr) (LibOIE_Base pInstance, const LibOIE_uint32 nErrorMessageBufferSize, LibOIE_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError);
+
+/**
+* Releases shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEReleaseInstancePtr) (LibOIE_Base pInstance);
+
+/**
+* Acquires shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEAcquireInstancePtr) (LibOIE_Base pInstance);
+
+/**
+* Returns the address of the SymbolLookupMethod
+*
+* @param[out] pSymbolLookupMethod - Address of the SymbolAddressMethod
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIEGetSymbolLookupMethodPtr) (LibOIE_pvoid * pSymbolLookupMethod);
+
+/**
+* Creates a open interface extension server instance.
+*
+* @param[out] pInstance - New Server instance
+* @return error code or 0 (success)
+*/
+typedef LibOIEResult (*PLibOIECreateServerPtr) (LibOIE_Server * pInstance);
+
+/*************************************************************************************************************************
+ Function Table Structure
+**************************************************************************************************************************/
+
+typedef struct {
+	void * m_LibraryHandle;
+	PLibOIEIterator_MoveNextPtr m_Iterator_MoveNext;
+	PLibOIEIterator_MovePreviousPtr m_Iterator_MovePrevious;
+	PLibOIEIterator_GetCurrentPtr m_Iterator_GetCurrent;
+	PLibOIEIterator_ClonePtr m_Iterator_Clone;
+	PLibOIEIterator_CountPtr m_Iterator_Count;
+	PLibOIEDataPackage_GetRawPayloadPtr m_DataPackage_GetRawPayload;
+	PLibOIEDataPackage_ReleasePtr m_DataPackage_Release;
+	PLibOIEPyroDataPackageIterator_GetCurrentPyroDataPackagePtr m_PyroDataPackageIterator_GetCurrentPyroDataPackage;
+	PLibOIEOctDataPackageIterator_GetCurrentOctDataPackagePtr m_OctDataPackageIterator_GetCurrentOctDataPackage;
+	PLibOIERemoteFunctionCall_GetFunctionNamePtr m_RemoteFunctionCall_GetFunctionName;
+	PLibOIERemoteFunctionCall_AddParameterPtr m_RemoteFunctionCall_AddParameter;
+	PLibOIERemoteFunctionCall_SendPtr m_RemoteFunctionCall_Send;
+	PLibOIEConnection_DisconnectPtr m_Connection_Disconnect;
+	PLibOIEConnection_SetRequestTimeoutPtr m_Connection_SetRequestTimeout;
+	PLibOIEConnection_SetMaxErrorCountPtr m_Connection_SetMaxErrorCount;
+	PLibOIEConnection_SetMaxMemoryCountPtr m_Connection_SetMaxMemoryCount;
+	PLibOIEConnection_SetBufferFilePtr m_Connection_SetBufferFile;
+	PLibOIEConnection_UnsetBufferFilePtr m_Connection_UnsetBufferFile;
+	PLibOIEConnection_SetCheckAliveIntervalPtr m_Connection_SetCheckAliveInterval;
+	PLibOIEConnection_RetrieveFirmwareVersionPtr m_Connection_RetrieveFirmwareVersion;
+	PLibOIEConnection_UpdateFirmwarePtr m_Connection_UpdateFirmware;
+	PLibOIEConnection_StartFirmwarePtr m_Connection_StartFirmware;
+	PLibOIEConnection_StopFirmwarePtr m_Connection_StopFirmware;
+	PLibOIEConnection_SetConnectionErrorCallbackPtr m_Connection_SetConnectionErrorCallback;
+	PLibOIEConnection_ClearErrorsPtr m_Connection_ClearErrors;
+	PLibOIEConnection_GetErrorCountPtr m_Connection_GetErrorCount;
+	PLibOIEConnection_GetErrorPtr m_Connection_GetError;
+	PLibOIEConnection_CreateRemoteFunctionCallPtr m_Connection_CreateRemoteFunctionCall;
+	PLibOIEConnection_GetBufferedPyroPackagesPtr m_Connection_GetBufferedPyroPackages;
+	PLibOIEConnection_GetBufferedOctPackagesPtr m_Connection_GetBufferedOctPackages;
+	PLibOIEConnectionIterator_GetCurrentConnectionPtr m_ConnectionIterator_GetCurrentConnection;
+	PLibOIEServer_StartPtr m_Server_Start;
+	PLibOIEServer_StopPtr m_Server_Stop;
+	PLibOIEServer_CloseAllConnectionsPtr m_Server_CloseAllConnections;
+	PLibOIEServer_SetThreadCountPtr m_Server_SetThreadCount;
+	PLibOIEServer_SetBufferSizePtr m_Server_SetBufferSize;
+	PLibOIEServer_AcceptDevicePtr m_Server_AcceptDevice;
+	PLibOIEServer_UnAcceptDevicePtr m_Server_UnAcceptDevice;
+	PLibOIEServer_ClearAcceptedDevicesPtr m_Server_ClearAcceptedDevices;
+	PLibOIEServer_ListConnectionsPtr m_Server_ListConnections;
+	PLibOIEServer_SetConnectionAcceptedCallbackPtr m_Server_SetConnectionAcceptedCallback;
+	PLibOIEServer_SetConnectionRejectedCallbackPtr m_Server_SetConnectionRejectedCallback;
+	PLibOIEGetVersionPtr m_GetVersion;
+	PLibOIEGetLastErrorPtr m_GetLastError;
+	PLibOIEReleaseInstancePtr m_ReleaseInstance;
+	PLibOIEAcquireInstancePtr m_AcquireInstance;
+	PLibOIEGetSymbolLookupMethodPtr m_GetSymbolLookupMethod;
+	PLibOIECreateServerPtr m_CreateServer;
+} sLibOIEDynamicWrapperTable;
+
+#endif // __LIBOIE_DYNAMICHEADER_CPPTYPES
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Headers/CppDynamic/liboie_dynamic.hpp b/Drivers/ScanLabOIE/LibOIE/Headers/CppDynamic/liboie_dynamic.hpp
new file mode 100644
index 00000000..725e194f
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Headers/CppDynamic/liboie_dynamic.hpp
@@ -0,0 +1,1958 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file in order to allow an easy
+ use of ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBOIE_CPPHEADER_DYNAMIC_CPP
+#define __LIBOIE_CPPHEADER_DYNAMIC_CPP
+
+#include "liboie_types.hpp"
+#include "liboie_dynamic.h"
+
+
+#ifdef _WIN32
+#include <windows.h>
+#else // _WIN32
+#include <dlfcn.h>
+#endif // _WIN32
+#include <string>
+#include <memory>
+#include <vector>
+#include <exception>
+
+namespace LibOIE {
+
+/*************************************************************************************************************************
+ Forward Declaration of all classes
+**************************************************************************************************************************/
+class CWrapper;
+class CBase;
+class CIterator;
+class CDataPackage;
+class CPyroDataPackage;
+class CPyroDataPackageIterator;
+class COctDataPackage;
+class COctDataPackageIterator;
+class CRemoteFunctionCall;
+class CConnection;
+class CConnectionIterator;
+class CServer;
+
+/*************************************************************************************************************************
+ Declaration of deprecated class types
+**************************************************************************************************************************/
+typedef CWrapper CLibOIEWrapper;
+typedef CBase CLibOIEBase;
+typedef CIterator CLibOIEIterator;
+typedef CDataPackage CLibOIEDataPackage;
+typedef CPyroDataPackage CLibOIEPyroDataPackage;
+typedef CPyroDataPackageIterator CLibOIEPyroDataPackageIterator;
+typedef COctDataPackage CLibOIEOctDataPackage;
+typedef COctDataPackageIterator CLibOIEOctDataPackageIterator;
+typedef CRemoteFunctionCall CLibOIERemoteFunctionCall;
+typedef CConnection CLibOIEConnection;
+typedef CConnectionIterator CLibOIEConnectionIterator;
+typedef CServer CLibOIEServer;
+
+/*************************************************************************************************************************
+ Declaration of shared pointer types
+**************************************************************************************************************************/
+typedef std::shared_ptr<CWrapper> PWrapper;
+typedef std::shared_ptr<CBase> PBase;
+typedef std::shared_ptr<CIterator> PIterator;
+typedef std::shared_ptr<CDataPackage> PDataPackage;
+typedef std::shared_ptr<CPyroDataPackage> PPyroDataPackage;
+typedef std::shared_ptr<CPyroDataPackageIterator> PPyroDataPackageIterator;
+typedef std::shared_ptr<COctDataPackage> POctDataPackage;
+typedef std::shared_ptr<COctDataPackageIterator> POctDataPackageIterator;
+typedef std::shared_ptr<CRemoteFunctionCall> PRemoteFunctionCall;
+typedef std::shared_ptr<CConnection> PConnection;
+typedef std::shared_ptr<CConnectionIterator> PConnectionIterator;
+typedef std::shared_ptr<CServer> PServer;
+
+/*************************************************************************************************************************
+ Declaration of deprecated shared pointer types
+**************************************************************************************************************************/
+typedef PWrapper PLibOIEWrapper;
+typedef PBase PLibOIEBase;
+typedef PIterator PLibOIEIterator;
+typedef PDataPackage PLibOIEDataPackage;
+typedef PPyroDataPackage PLibOIEPyroDataPackage;
+typedef PPyroDataPackageIterator PLibOIEPyroDataPackageIterator;
+typedef POctDataPackage PLibOIEOctDataPackage;
+typedef POctDataPackageIterator PLibOIEOctDataPackageIterator;
+typedef PRemoteFunctionCall PLibOIERemoteFunctionCall;
+typedef PConnection PLibOIEConnection;
+typedef PConnectionIterator PLibOIEConnectionIterator;
+typedef PServer PLibOIEServer;
+
+
+/*************************************************************************************************************************
+ classParam Definition
+**************************************************************************************************************************/
+
+template<class T> class classParam {
+private:
+	const T* m_ptr;
+
+public:
+	classParam(const T* ptr)
+		: m_ptr (ptr)
+	{
+	}
+
+	classParam(std::shared_ptr <T> sharedPtr)
+		: m_ptr (sharedPtr.get())
+	{
+	}
+
+	LibOIEHandle GetHandle()
+	{
+		if (m_ptr != nullptr)
+			return m_ptr->handle();
+		return nullptr;
+	}
+};
+
+/*************************************************************************************************************************
+ Class ELibOIEException 
+**************************************************************************************************************************/
+class ELibOIEException : public std::exception {
+protected:
+	/**
+	* Error code for the Exception.
+	*/
+	LibOIEResult m_errorCode;
+	/**
+	* Error message for the Exception.
+	*/
+	std::string m_errorMessage;
+
+public:
+	/**
+	* Exception Constructor.
+	*/
+	ELibOIEException(LibOIEResult errorCode, const std::string & sErrorMessage)
+		: m_errorMessage("LibOIE Error " + std::to_string(errorCode) + " (" + sErrorMessage + ")")
+	{
+		m_errorCode = errorCode;
+	}
+
+	/**
+	* Returns error code
+	*/
+	LibOIEResult getErrorCode() const noexcept
+	{
+		return m_errorCode;
+	}
+
+	/**
+	* Returns error message
+	*/
+	const char* what() const noexcept
+	{
+		return m_errorMessage.c_str();
+	}
+
+};
+
+/*************************************************************************************************************************
+ Class CInputVector
+**************************************************************************************************************************/
+template <typename T>
+class CInputVector {
+private:
+	
+	const T* m_data;
+	size_t m_size;
+	
+public:
+	
+	CInputVector( const std::vector<T>& vec)
+		: m_data( vec.data() ), m_size( vec.size() )
+	{
+	}
+	
+	CInputVector( const T* in_data, size_t in_size)
+		: m_data( in_data ), m_size(in_size )
+	{
+	}
+	
+	const T* data() const
+	{
+		return m_data;
+	}
+	
+	size_t size() const
+	{
+		return m_size;
+	}
+	
+};
+
+// declare deprecated class name
+template<typename T>
+using CLibOIEInputVector = CInputVector<T>;
+
+/*************************************************************************************************************************
+ Class CWrapper 
+**************************************************************************************************************************/
+class CWrapper {
+public:
+	
+	CWrapper(void* pSymbolLookupMethod)
+	{
+		CheckError(nullptr, initWrapperTable(&m_WrapperTable));
+		CheckError(nullptr, loadWrapperTableFromSymbolLookupMethod(&m_WrapperTable, pSymbolLookupMethod));
+		
+		CheckError(nullptr, checkBinaryVersion());
+	}
+	
+	CWrapper(const std::string &sFileName)
+	{
+		CheckError(nullptr, initWrapperTable(&m_WrapperTable));
+		CheckError(nullptr, loadWrapperTable(&m_WrapperTable, sFileName.c_str()));
+		
+		CheckError(nullptr, checkBinaryVersion());
+	}
+	
+	static PWrapper loadLibrary(const std::string &sFileName)
+	{
+		return std::make_shared<CWrapper>(sFileName);
+	}
+	
+	static PWrapper loadLibraryFromSymbolLookupMethod(void* pSymbolLookupMethod)
+	{
+		return std::make_shared<CWrapper>(pSymbolLookupMethod);
+	}
+	
+	~CWrapper()
+	{
+		releaseWrapperTable(&m_WrapperTable);
+	}
+	
+	inline void CheckError(CBase * pBaseClass, LibOIEResult nResult);
+
+	inline void GetVersion(LibOIE_uint32 & nMajor, LibOIE_uint32 & nMinor, LibOIE_uint32 & nMicro);
+	inline bool GetLastError(classParam<CBase> pInstance, std::string & sErrorMessage);
+	inline void ReleaseInstance(classParam<CBase> pInstance);
+	inline void AcquireInstance(classParam<CBase> pInstance);
+	inline LibOIE_pvoid GetSymbolLookupMethod();
+	inline PServer CreateServer();
+
+private:
+	sLibOIEDynamicWrapperTable m_WrapperTable;
+	
+	LibOIEResult checkBinaryVersion()
+	{
+		LibOIE_uint32 nMajor, nMinor, nMicro;
+		GetVersion(nMajor, nMinor, nMicro);
+		if ( (nMajor != LIBOIE_VERSION_MAJOR) || (nMinor < LIBOIE_VERSION_MINOR) ) {
+			return LIBOIE_ERROR_INCOMPATIBLEBINARYVERSION;
+		}
+		return LIBOIE_SUCCESS;
+	}
+	LibOIEResult initWrapperTable(sLibOIEDynamicWrapperTable * pWrapperTable);
+	LibOIEResult releaseWrapperTable(sLibOIEDynamicWrapperTable * pWrapperTable);
+	LibOIEResult loadWrapperTable(sLibOIEDynamicWrapperTable * pWrapperTable, const char * pLibraryFileName);
+	LibOIEResult loadWrapperTableFromSymbolLookupMethod(sLibOIEDynamicWrapperTable * pWrapperTable, void* pSymbolLookupMethod);
+
+	friend class CBase;
+	friend class CIterator;
+	friend class CDataPackage;
+	friend class CPyroDataPackage;
+	friend class CPyroDataPackageIterator;
+	friend class COctDataPackage;
+	friend class COctDataPackageIterator;
+	friend class CRemoteFunctionCall;
+	friend class CConnection;
+	friend class CConnectionIterator;
+	friend class CServer;
+
+};
+
+	
+/*************************************************************************************************************************
+ Class CBase 
+**************************************************************************************************************************/
+class CBase {
+public:
+	
+protected:
+	/* Wrapper Object that created the class. */
+	CWrapper * m_pWrapper;
+	/* Handle to Instance in library*/
+	LibOIEHandle m_pHandle;
+
+	/* Checks for an Error code and raises Exceptions */
+	void CheckError(LibOIEResult nResult)
+	{
+		if (m_pWrapper != nullptr)
+			m_pWrapper->CheckError(this, nResult);
+	}
+public:
+	/**
+	* CBase::CBase - Constructor for Base class.
+	*/
+	CBase(CWrapper * pWrapper, LibOIEHandle pHandle)
+		: m_pWrapper(pWrapper), m_pHandle(pHandle)
+	{
+	}
+
+	/**
+	* CBase::~CBase - Destructor for Base class.
+	*/
+	virtual ~CBase()
+	{
+		if (m_pWrapper != nullptr)
+			m_pWrapper->ReleaseInstance(this);
+		m_pWrapper = nullptr;
+	}
+
+	/**
+	* CBase::handle - Returns handle to instance.
+	*/
+	LibOIEHandle handle() const
+	{
+		return m_pHandle;
+	}
+
+	/**
+	* CBase::wrapper - Returns wrapper instance.
+	*/
+	CWrapper * wrapper() const
+	{
+		return m_pWrapper;
+	}
+	
+	friend class CWrapper;
+};
+	
+/*************************************************************************************************************************
+ Class CIterator 
+**************************************************************************************************************************/
+class CIterator : public CBase {
+public:
+	
+	/**
+	* CIterator::CIterator - Constructor for Iterator class.
+	*/
+	CIterator(CWrapper* pWrapper, LibOIEHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline bool MoveNext();
+	inline bool MovePrevious();
+	inline PBase GetCurrent();
+	inline PIterator Clone();
+	inline LibOIE_uint64 Count();
+};
+	
+/*************************************************************************************************************************
+ Class CDataPackage 
+**************************************************************************************************************************/
+class CDataPackage : public CBase {
+public:
+	
+	/**
+	* CDataPackage::CDataPackage - Constructor for DataPackage class.
+	*/
+	CDataPackage(CWrapper* pWrapper, LibOIEHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline void GetRawPayload(std::vector<LibOIE_uint8> & PayloadBuffer);
+	inline void Release();
+};
+	
+/*************************************************************************************************************************
+ Class CPyroDataPackage 
+**************************************************************************************************************************/
+class CPyroDataPackage : public CDataPackage {
+public:
+	
+	/**
+	* CPyroDataPackage::CPyroDataPackage - Constructor for PyroDataPackage class.
+	*/
+	CPyroDataPackage(CWrapper* pWrapper, LibOIEHandle pHandle)
+		: CDataPackage(pWrapper, pHandle)
+	{
+	}
+	
+};
+	
+/*************************************************************************************************************************
+ Class CPyroDataPackageIterator 
+**************************************************************************************************************************/
+class CPyroDataPackageIterator : public CIterator {
+public:
+	
+	/**
+	* CPyroDataPackageIterator::CPyroDataPackageIterator - Constructor for PyroDataPackageIterator class.
+	*/
+	CPyroDataPackageIterator(CWrapper* pWrapper, LibOIEHandle pHandle)
+		: CIterator(pWrapper, pHandle)
+	{
+	}
+	
+	inline PPyroDataPackage GetCurrentPyroDataPackage();
+};
+	
+/*************************************************************************************************************************
+ Class COctDataPackage 
+**************************************************************************************************************************/
+class COctDataPackage : public CDataPackage {
+public:
+	
+	/**
+	* COctDataPackage::COctDataPackage - Constructor for OctDataPackage class.
+	*/
+	COctDataPackage(CWrapper* pWrapper, LibOIEHandle pHandle)
+		: CDataPackage(pWrapper, pHandle)
+	{
+	}
+	
+};
+	
+/*************************************************************************************************************************
+ Class COctDataPackageIterator 
+**************************************************************************************************************************/
+class COctDataPackageIterator : public CIterator {
+public:
+	
+	/**
+	* COctDataPackageIterator::COctDataPackageIterator - Constructor for OctDataPackageIterator class.
+	*/
+	COctDataPackageIterator(CWrapper* pWrapper, LibOIEHandle pHandle)
+		: CIterator(pWrapper, pHandle)
+	{
+	}
+	
+	inline POctDataPackage GetCurrentOctDataPackage();
+};
+	
+/*************************************************************************************************************************
+ Class CRemoteFunctionCall 
+**************************************************************************************************************************/
+class CRemoteFunctionCall : public CBase {
+public:
+	
+	/**
+	* CRemoteFunctionCall::CRemoteFunctionCall - Constructor for RemoteFunctionCall class.
+	*/
+	CRemoteFunctionCall(CWrapper* pWrapper, LibOIEHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline std::string GetFunctionName();
+	inline void AddParameter(const std::string & sParameter);
+	inline std::string Send();
+};
+	
+/*************************************************************************************************************************
+ Class CConnection 
+**************************************************************************************************************************/
+class CConnection : public CBase {
+public:
+	
+	/**
+	* CConnection::CConnection - Constructor for Connection class.
+	*/
+	CConnection(CWrapper* pWrapper, LibOIEHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline void Disconnect();
+	inline void SetRequestTimeout(const LibOIE_uint32 nTimeout);
+	inline void SetMaxErrorCount(const LibOIE_uint32 nErrorCount);
+	inline void SetMaxMemoryCount(const LibOIE_uint32 nMaxMemoryCount);
+	inline void SetBufferFile(const std::string & sFileName, const LibOIE_uint64 nMaxMemoryCount);
+	inline void UnsetBufferFile();
+	inline void SetCheckAliveInterval(const LibOIE_uint32 nCheckAliveInterval);
+	inline void RetrieveFirmwareVersion(const std::string & sFirmwareName, std::string & sFirmwareVersion, std::string & sFilename, std::string & sFiledate, std::string & sSHA256);
+	inline void UpdateFirmware(const std::string & sFirmwareName, const std::string & sFirmwareVersion, const std::string & sFileName, const std::string & sFileDate, const std::string & sSHA256, const CInputVector<LibOIE_uint8> & BinaryDataBuffer);
+	inline bool StartFirmware(const std::string & sFileName);
+	inline bool StopFirmware(const std::string & sFileName);
+	inline void SetConnectionErrorCallback(const ConnectionErrorCallback pCallback);
+	inline void ClearErrors();
+	inline LibOIE_uint32 GetErrorCount();
+	inline void GetError(const LibOIE_uint32 nErrorIndex, std::string & sErrorMessage, std::string & sTimestamp);
+	inline PRemoteFunctionCall CreateRemoteFunctionCall(const std::string & sFunctionName);
+	inline PPyroDataPackageIterator GetBufferedPyroPackages();
+	inline POctDataPackageIterator GetBufferedOctPackages();
+};
+	
+/*************************************************************************************************************************
+ Class CConnectionIterator 
+**************************************************************************************************************************/
+class CConnectionIterator : public CIterator {
+public:
+	
+	/**
+	* CConnectionIterator::CConnectionIterator - Constructor for ConnectionIterator class.
+	*/
+	CConnectionIterator(CWrapper* pWrapper, LibOIEHandle pHandle)
+		: CIterator(pWrapper, pHandle)
+	{
+	}
+	
+	inline PConnection GetCurrentConnection();
+};
+	
+/*************************************************************************************************************************
+ Class CServer 
+**************************************************************************************************************************/
+class CServer : public CBase {
+public:
+	
+	/**
+	* CServer::CServer - Constructor for Server class.
+	*/
+	CServer(CWrapper* pWrapper, LibOIEHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline void Start(const std::string & sIPAddress, const LibOIE_uint32 nPort, const bool bIPv6);
+	inline void Stop();
+	inline void CloseAllConnections();
+	inline void SetThreadCount(const LibOIE_uint32 nThreadCount);
+	inline void SetBufferSize(const LibOIE_uint32 nRCVBufferSize);
+	inline LibOIE_uint32 AcceptDevice(const std::string & sDeviceName, const std::string & sApplicationName, const std::string & sVersionName);
+	inline void UnAcceptDevice(const LibOIE_uint32 nRuleID);
+	inline void ClearAcceptedDevices();
+	inline PConnectionIterator ListConnections();
+	inline void SetConnectionAcceptedCallback(const ConnectionAcceptedCallback pCallback);
+	inline void SetConnectionRejectedCallback(const ConnectionRejectedCallback pCallback);
+};
+	
+	/**
+	* CWrapper::GetVersion - retrieves the binary version of this library.
+	* @param[out] nMajor - returns the major version of this library
+	* @param[out] nMinor - returns the minor version of this library
+	* @param[out] nMicro - returns the micro version of this library
+	*/
+	inline void CWrapper::GetVersion(LibOIE_uint32 & nMajor, LibOIE_uint32 & nMinor, LibOIE_uint32 & nMicro)
+	{
+		CheckError(nullptr,m_WrapperTable.m_GetVersion(&nMajor, &nMinor, &nMicro));
+	}
+	
+	/**
+	* CWrapper::GetLastError - Returns the last error recorded on this object
+	* @param[in] pInstance - Instance Handle
+	* @param[out] sErrorMessage - Message of the last error
+	* @return Is there a last error to query
+	*/
+	inline bool CWrapper::GetLastError(classParam<CBase> pInstance, std::string & sErrorMessage)
+	{
+		LibOIEHandle hInstance = pInstance.GetHandle();
+		LibOIE_uint32 bytesNeededErrorMessage = 0;
+		LibOIE_uint32 bytesWrittenErrorMessage = 0;
+		bool resultHasError = 0;
+		CheckError(nullptr,m_WrapperTable.m_GetLastError(hInstance, 0, &bytesNeededErrorMessage, nullptr, &resultHasError));
+		std::vector<char> bufferErrorMessage(bytesNeededErrorMessage);
+		CheckError(nullptr,m_WrapperTable.m_GetLastError(hInstance, bytesNeededErrorMessage, &bytesWrittenErrorMessage, &bufferErrorMessage[0], &resultHasError));
+		sErrorMessage = std::string(&bufferErrorMessage[0]);
+		
+		return resultHasError;
+	}
+	
+	/**
+	* CWrapper::ReleaseInstance - Releases shared ownership of an Instance
+	* @param[in] pInstance - Instance Handle
+	*/
+	inline void CWrapper::ReleaseInstance(classParam<CBase> pInstance)
+	{
+		LibOIEHandle hInstance = pInstance.GetHandle();
+		CheckError(nullptr,m_WrapperTable.m_ReleaseInstance(hInstance));
+	}
+	
+	/**
+	* CWrapper::AcquireInstance - Acquires shared ownership of an Instance
+	* @param[in] pInstance - Instance Handle
+	*/
+	inline void CWrapper::AcquireInstance(classParam<CBase> pInstance)
+	{
+		LibOIEHandle hInstance = pInstance.GetHandle();
+		CheckError(nullptr,m_WrapperTable.m_AcquireInstance(hInstance));
+	}
+	
+	/**
+	* CWrapper::GetSymbolLookupMethod - Returns the address of the SymbolLookupMethod
+	* @return Address of the SymbolAddressMethod
+	*/
+	inline LibOIE_pvoid CWrapper::GetSymbolLookupMethod()
+	{
+		LibOIE_pvoid resultSymbolLookupMethod = 0;
+		CheckError(nullptr,m_WrapperTable.m_GetSymbolLookupMethod(&resultSymbolLookupMethod));
+		
+		return resultSymbolLookupMethod;
+	}
+	
+	/**
+	* CWrapper::CreateServer - Creates a open interface extension server instance.
+	* @return New Server instance
+	*/
+	inline PServer CWrapper::CreateServer()
+	{
+		LibOIEHandle hInstance = nullptr;
+		CheckError(nullptr,m_WrapperTable.m_CreateServer(&hInstance));
+		
+		if (!hInstance) {
+			CheckError(nullptr,LIBOIE_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CServer>(this, hInstance);
+	}
+	
+	inline void CWrapper::CheckError(CBase * pBaseClass, LibOIEResult nResult)
+	{
+		if (nResult != 0) {
+			std::string sErrorMessage;
+			if (pBaseClass != nullptr) {
+				GetLastError(pBaseClass, sErrorMessage);
+			}
+			throw ELibOIEException(nResult, sErrorMessage);
+		}
+	}
+	
+
+	inline LibOIEResult CWrapper::initWrapperTable(sLibOIEDynamicWrapperTable * pWrapperTable)
+	{
+		if (pWrapperTable == nullptr)
+			return LIBOIE_ERROR_INVALIDPARAM;
+		
+		pWrapperTable->m_LibraryHandle = nullptr;
+		pWrapperTable->m_Iterator_MoveNext = nullptr;
+		pWrapperTable->m_Iterator_MovePrevious = nullptr;
+		pWrapperTable->m_Iterator_GetCurrent = nullptr;
+		pWrapperTable->m_Iterator_Clone = nullptr;
+		pWrapperTable->m_Iterator_Count = nullptr;
+		pWrapperTable->m_DataPackage_GetRawPayload = nullptr;
+		pWrapperTable->m_DataPackage_Release = nullptr;
+		pWrapperTable->m_PyroDataPackageIterator_GetCurrentPyroDataPackage = nullptr;
+		pWrapperTable->m_OctDataPackageIterator_GetCurrentOctDataPackage = nullptr;
+		pWrapperTable->m_RemoteFunctionCall_GetFunctionName = nullptr;
+		pWrapperTable->m_RemoteFunctionCall_AddParameter = nullptr;
+		pWrapperTable->m_RemoteFunctionCall_Send = nullptr;
+		pWrapperTable->m_Connection_Disconnect = nullptr;
+		pWrapperTable->m_Connection_SetRequestTimeout = nullptr;
+		pWrapperTable->m_Connection_SetMaxErrorCount = nullptr;
+		pWrapperTable->m_Connection_SetMaxMemoryCount = nullptr;
+		pWrapperTable->m_Connection_SetBufferFile = nullptr;
+		pWrapperTable->m_Connection_UnsetBufferFile = nullptr;
+		pWrapperTable->m_Connection_SetCheckAliveInterval = nullptr;
+		pWrapperTable->m_Connection_RetrieveFirmwareVersion = nullptr;
+		pWrapperTable->m_Connection_UpdateFirmware = nullptr;
+		pWrapperTable->m_Connection_StartFirmware = nullptr;
+		pWrapperTable->m_Connection_StopFirmware = nullptr;
+		pWrapperTable->m_Connection_SetConnectionErrorCallback = nullptr;
+		pWrapperTable->m_Connection_ClearErrors = nullptr;
+		pWrapperTable->m_Connection_GetErrorCount = nullptr;
+		pWrapperTable->m_Connection_GetError = nullptr;
+		pWrapperTable->m_Connection_CreateRemoteFunctionCall = nullptr;
+		pWrapperTable->m_Connection_GetBufferedPyroPackages = nullptr;
+		pWrapperTable->m_Connection_GetBufferedOctPackages = nullptr;
+		pWrapperTable->m_ConnectionIterator_GetCurrentConnection = nullptr;
+		pWrapperTable->m_Server_Start = nullptr;
+		pWrapperTable->m_Server_Stop = nullptr;
+		pWrapperTable->m_Server_CloseAllConnections = nullptr;
+		pWrapperTable->m_Server_SetThreadCount = nullptr;
+		pWrapperTable->m_Server_SetBufferSize = nullptr;
+		pWrapperTable->m_Server_AcceptDevice = nullptr;
+		pWrapperTable->m_Server_UnAcceptDevice = nullptr;
+		pWrapperTable->m_Server_ClearAcceptedDevices = nullptr;
+		pWrapperTable->m_Server_ListConnections = nullptr;
+		pWrapperTable->m_Server_SetConnectionAcceptedCallback = nullptr;
+		pWrapperTable->m_Server_SetConnectionRejectedCallback = nullptr;
+		pWrapperTable->m_GetVersion = nullptr;
+		pWrapperTable->m_GetLastError = nullptr;
+		pWrapperTable->m_ReleaseInstance = nullptr;
+		pWrapperTable->m_AcquireInstance = nullptr;
+		pWrapperTable->m_GetSymbolLookupMethod = nullptr;
+		pWrapperTable->m_CreateServer = nullptr;
+		
+		return LIBOIE_SUCCESS;
+	}
+
+	inline LibOIEResult CWrapper::releaseWrapperTable(sLibOIEDynamicWrapperTable * pWrapperTable)
+	{
+		if (pWrapperTable == nullptr)
+			return LIBOIE_ERROR_INVALIDPARAM;
+		
+		if (pWrapperTable->m_LibraryHandle != nullptr) {
+		#ifdef _WIN32
+			HMODULE hModule = (HMODULE) pWrapperTable->m_LibraryHandle;
+			FreeLibrary(hModule);
+		#else // _WIN32
+			dlclose(pWrapperTable->m_LibraryHandle);
+		#endif // _WIN32
+			return initWrapperTable(pWrapperTable);
+		}
+		
+		return LIBOIE_SUCCESS;
+	}
+
+	inline LibOIEResult CWrapper::loadWrapperTable(sLibOIEDynamicWrapperTable * pWrapperTable, const char * pLibraryFileName)
+	{
+		if (pWrapperTable == nullptr)
+			return LIBOIE_ERROR_INVALIDPARAM;
+		if (pLibraryFileName == nullptr)
+			return LIBOIE_ERROR_INVALIDPARAM;
+		
+		#ifdef _WIN32
+		// Convert filename to UTF16-string
+		int nLength = (int)strlen(pLibraryFileName);
+		int nBufferSize = nLength * 2 + 2;
+		std::vector<wchar_t> wsLibraryFileName(nBufferSize);
+		int nResult = MultiByteToWideChar(CP_UTF8, 0, pLibraryFileName, nLength, &wsLibraryFileName[0], nBufferSize);
+		if (nResult == 0)
+			return LIBOIE_ERROR_COULDNOTLOADLIBRARY;
+		
+		HMODULE hLibrary = LoadLibraryW(wsLibraryFileName.data());
+		if (hLibrary == 0) 
+			return LIBOIE_ERROR_COULDNOTLOADLIBRARY;
+		#else // _WIN32
+		void* hLibrary = dlopen(pLibraryFileName, RTLD_LAZY);
+		if (hLibrary == 0) 
+			return LIBOIE_ERROR_COULDNOTLOADLIBRARY;
+		dlerror();
+		#endif // _WIN32
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Iterator_MoveNext = (PLibOIEIterator_MoveNextPtr) GetProcAddress(hLibrary, "liboie_iterator_movenext");
+		#else // _WIN32
+		pWrapperTable->m_Iterator_MoveNext = (PLibOIEIterator_MoveNextPtr) dlsym(hLibrary, "liboie_iterator_movenext");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Iterator_MoveNext == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Iterator_MovePrevious = (PLibOIEIterator_MovePreviousPtr) GetProcAddress(hLibrary, "liboie_iterator_moveprevious");
+		#else // _WIN32
+		pWrapperTable->m_Iterator_MovePrevious = (PLibOIEIterator_MovePreviousPtr) dlsym(hLibrary, "liboie_iterator_moveprevious");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Iterator_MovePrevious == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Iterator_GetCurrent = (PLibOIEIterator_GetCurrentPtr) GetProcAddress(hLibrary, "liboie_iterator_getcurrent");
+		#else // _WIN32
+		pWrapperTable->m_Iterator_GetCurrent = (PLibOIEIterator_GetCurrentPtr) dlsym(hLibrary, "liboie_iterator_getcurrent");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Iterator_GetCurrent == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Iterator_Clone = (PLibOIEIterator_ClonePtr) GetProcAddress(hLibrary, "liboie_iterator_clone");
+		#else // _WIN32
+		pWrapperTable->m_Iterator_Clone = (PLibOIEIterator_ClonePtr) dlsym(hLibrary, "liboie_iterator_clone");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Iterator_Clone == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Iterator_Count = (PLibOIEIterator_CountPtr) GetProcAddress(hLibrary, "liboie_iterator_count");
+		#else // _WIN32
+		pWrapperTable->m_Iterator_Count = (PLibOIEIterator_CountPtr) dlsym(hLibrary, "liboie_iterator_count");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Iterator_Count == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_DataPackage_GetRawPayload = (PLibOIEDataPackage_GetRawPayloadPtr) GetProcAddress(hLibrary, "liboie_datapackage_getrawpayload");
+		#else // _WIN32
+		pWrapperTable->m_DataPackage_GetRawPayload = (PLibOIEDataPackage_GetRawPayloadPtr) dlsym(hLibrary, "liboie_datapackage_getrawpayload");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_DataPackage_GetRawPayload == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_DataPackage_Release = (PLibOIEDataPackage_ReleasePtr) GetProcAddress(hLibrary, "liboie_datapackage_release");
+		#else // _WIN32
+		pWrapperTable->m_DataPackage_Release = (PLibOIEDataPackage_ReleasePtr) dlsym(hLibrary, "liboie_datapackage_release");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_DataPackage_Release == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_PyroDataPackageIterator_GetCurrentPyroDataPackage = (PLibOIEPyroDataPackageIterator_GetCurrentPyroDataPackagePtr) GetProcAddress(hLibrary, "liboie_pyrodatapackageiterator_getcurrentpyrodatapackage");
+		#else // _WIN32
+		pWrapperTable->m_PyroDataPackageIterator_GetCurrentPyroDataPackage = (PLibOIEPyroDataPackageIterator_GetCurrentPyroDataPackagePtr) dlsym(hLibrary, "liboie_pyrodatapackageiterator_getcurrentpyrodatapackage");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_PyroDataPackageIterator_GetCurrentPyroDataPackage == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_OctDataPackageIterator_GetCurrentOctDataPackage = (PLibOIEOctDataPackageIterator_GetCurrentOctDataPackagePtr) GetProcAddress(hLibrary, "liboie_octdatapackageiterator_getcurrentoctdatapackage");
+		#else // _WIN32
+		pWrapperTable->m_OctDataPackageIterator_GetCurrentOctDataPackage = (PLibOIEOctDataPackageIterator_GetCurrentOctDataPackagePtr) dlsym(hLibrary, "liboie_octdatapackageiterator_getcurrentoctdatapackage");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_OctDataPackageIterator_GetCurrentOctDataPackage == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_RemoteFunctionCall_GetFunctionName = (PLibOIERemoteFunctionCall_GetFunctionNamePtr) GetProcAddress(hLibrary, "liboie_remotefunctioncall_getfunctionname");
+		#else // _WIN32
+		pWrapperTable->m_RemoteFunctionCall_GetFunctionName = (PLibOIERemoteFunctionCall_GetFunctionNamePtr) dlsym(hLibrary, "liboie_remotefunctioncall_getfunctionname");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_RemoteFunctionCall_GetFunctionName == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_RemoteFunctionCall_AddParameter = (PLibOIERemoteFunctionCall_AddParameterPtr) GetProcAddress(hLibrary, "liboie_remotefunctioncall_addparameter");
+		#else // _WIN32
+		pWrapperTable->m_RemoteFunctionCall_AddParameter = (PLibOIERemoteFunctionCall_AddParameterPtr) dlsym(hLibrary, "liboie_remotefunctioncall_addparameter");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_RemoteFunctionCall_AddParameter == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_RemoteFunctionCall_Send = (PLibOIERemoteFunctionCall_SendPtr) GetProcAddress(hLibrary, "liboie_remotefunctioncall_send");
+		#else // _WIN32
+		pWrapperTable->m_RemoteFunctionCall_Send = (PLibOIERemoteFunctionCall_SendPtr) dlsym(hLibrary, "liboie_remotefunctioncall_send");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_RemoteFunctionCall_Send == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_Disconnect = (PLibOIEConnection_DisconnectPtr) GetProcAddress(hLibrary, "liboie_connection_disconnect");
+		#else // _WIN32
+		pWrapperTable->m_Connection_Disconnect = (PLibOIEConnection_DisconnectPtr) dlsym(hLibrary, "liboie_connection_disconnect");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_Disconnect == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_SetRequestTimeout = (PLibOIEConnection_SetRequestTimeoutPtr) GetProcAddress(hLibrary, "liboie_connection_setrequesttimeout");
+		#else // _WIN32
+		pWrapperTable->m_Connection_SetRequestTimeout = (PLibOIEConnection_SetRequestTimeoutPtr) dlsym(hLibrary, "liboie_connection_setrequesttimeout");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_SetRequestTimeout == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_SetMaxErrorCount = (PLibOIEConnection_SetMaxErrorCountPtr) GetProcAddress(hLibrary, "liboie_connection_setmaxerrorcount");
+		#else // _WIN32
+		pWrapperTable->m_Connection_SetMaxErrorCount = (PLibOIEConnection_SetMaxErrorCountPtr) dlsym(hLibrary, "liboie_connection_setmaxerrorcount");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_SetMaxErrorCount == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_SetMaxMemoryCount = (PLibOIEConnection_SetMaxMemoryCountPtr) GetProcAddress(hLibrary, "liboie_connection_setmaxmemorycount");
+		#else // _WIN32
+		pWrapperTable->m_Connection_SetMaxMemoryCount = (PLibOIEConnection_SetMaxMemoryCountPtr) dlsym(hLibrary, "liboie_connection_setmaxmemorycount");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_SetMaxMemoryCount == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_SetBufferFile = (PLibOIEConnection_SetBufferFilePtr) GetProcAddress(hLibrary, "liboie_connection_setbufferfile");
+		#else // _WIN32
+		pWrapperTable->m_Connection_SetBufferFile = (PLibOIEConnection_SetBufferFilePtr) dlsym(hLibrary, "liboie_connection_setbufferfile");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_SetBufferFile == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_UnsetBufferFile = (PLibOIEConnection_UnsetBufferFilePtr) GetProcAddress(hLibrary, "liboie_connection_unsetbufferfile");
+		#else // _WIN32
+		pWrapperTable->m_Connection_UnsetBufferFile = (PLibOIEConnection_UnsetBufferFilePtr) dlsym(hLibrary, "liboie_connection_unsetbufferfile");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_UnsetBufferFile == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_SetCheckAliveInterval = (PLibOIEConnection_SetCheckAliveIntervalPtr) GetProcAddress(hLibrary, "liboie_connection_setcheckaliveinterval");
+		#else // _WIN32
+		pWrapperTable->m_Connection_SetCheckAliveInterval = (PLibOIEConnection_SetCheckAliveIntervalPtr) dlsym(hLibrary, "liboie_connection_setcheckaliveinterval");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_SetCheckAliveInterval == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_RetrieveFirmwareVersion = (PLibOIEConnection_RetrieveFirmwareVersionPtr) GetProcAddress(hLibrary, "liboie_connection_retrievefirmwareversion");
+		#else // _WIN32
+		pWrapperTable->m_Connection_RetrieveFirmwareVersion = (PLibOIEConnection_RetrieveFirmwareVersionPtr) dlsym(hLibrary, "liboie_connection_retrievefirmwareversion");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_RetrieveFirmwareVersion == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_UpdateFirmware = (PLibOIEConnection_UpdateFirmwarePtr) GetProcAddress(hLibrary, "liboie_connection_updatefirmware");
+		#else // _WIN32
+		pWrapperTable->m_Connection_UpdateFirmware = (PLibOIEConnection_UpdateFirmwarePtr) dlsym(hLibrary, "liboie_connection_updatefirmware");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_UpdateFirmware == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_StartFirmware = (PLibOIEConnection_StartFirmwarePtr) GetProcAddress(hLibrary, "liboie_connection_startfirmware");
+		#else // _WIN32
+		pWrapperTable->m_Connection_StartFirmware = (PLibOIEConnection_StartFirmwarePtr) dlsym(hLibrary, "liboie_connection_startfirmware");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_StartFirmware == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_StopFirmware = (PLibOIEConnection_StopFirmwarePtr) GetProcAddress(hLibrary, "liboie_connection_stopfirmware");
+		#else // _WIN32
+		pWrapperTable->m_Connection_StopFirmware = (PLibOIEConnection_StopFirmwarePtr) dlsym(hLibrary, "liboie_connection_stopfirmware");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_StopFirmware == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_SetConnectionErrorCallback = (PLibOIEConnection_SetConnectionErrorCallbackPtr) GetProcAddress(hLibrary, "liboie_connection_setconnectionerrorcallback");
+		#else // _WIN32
+		pWrapperTable->m_Connection_SetConnectionErrorCallback = (PLibOIEConnection_SetConnectionErrorCallbackPtr) dlsym(hLibrary, "liboie_connection_setconnectionerrorcallback");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_SetConnectionErrorCallback == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_ClearErrors = (PLibOIEConnection_ClearErrorsPtr) GetProcAddress(hLibrary, "liboie_connection_clearerrors");
+		#else // _WIN32
+		pWrapperTable->m_Connection_ClearErrors = (PLibOIEConnection_ClearErrorsPtr) dlsym(hLibrary, "liboie_connection_clearerrors");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_ClearErrors == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_GetErrorCount = (PLibOIEConnection_GetErrorCountPtr) GetProcAddress(hLibrary, "liboie_connection_geterrorcount");
+		#else // _WIN32
+		pWrapperTable->m_Connection_GetErrorCount = (PLibOIEConnection_GetErrorCountPtr) dlsym(hLibrary, "liboie_connection_geterrorcount");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_GetErrorCount == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_GetError = (PLibOIEConnection_GetErrorPtr) GetProcAddress(hLibrary, "liboie_connection_geterror");
+		#else // _WIN32
+		pWrapperTable->m_Connection_GetError = (PLibOIEConnection_GetErrorPtr) dlsym(hLibrary, "liboie_connection_geterror");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_GetError == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_CreateRemoteFunctionCall = (PLibOIEConnection_CreateRemoteFunctionCallPtr) GetProcAddress(hLibrary, "liboie_connection_createremotefunctioncall");
+		#else // _WIN32
+		pWrapperTable->m_Connection_CreateRemoteFunctionCall = (PLibOIEConnection_CreateRemoteFunctionCallPtr) dlsym(hLibrary, "liboie_connection_createremotefunctioncall");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_CreateRemoteFunctionCall == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_GetBufferedPyroPackages = (PLibOIEConnection_GetBufferedPyroPackagesPtr) GetProcAddress(hLibrary, "liboie_connection_getbufferedpyropackages");
+		#else // _WIN32
+		pWrapperTable->m_Connection_GetBufferedPyroPackages = (PLibOIEConnection_GetBufferedPyroPackagesPtr) dlsym(hLibrary, "liboie_connection_getbufferedpyropackages");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_GetBufferedPyroPackages == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Connection_GetBufferedOctPackages = (PLibOIEConnection_GetBufferedOctPackagesPtr) GetProcAddress(hLibrary, "liboie_connection_getbufferedoctpackages");
+		#else // _WIN32
+		pWrapperTable->m_Connection_GetBufferedOctPackages = (PLibOIEConnection_GetBufferedOctPackagesPtr) dlsym(hLibrary, "liboie_connection_getbufferedoctpackages");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Connection_GetBufferedOctPackages == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_ConnectionIterator_GetCurrentConnection = (PLibOIEConnectionIterator_GetCurrentConnectionPtr) GetProcAddress(hLibrary, "liboie_connectioniterator_getcurrentconnection");
+		#else // _WIN32
+		pWrapperTable->m_ConnectionIterator_GetCurrentConnection = (PLibOIEConnectionIterator_GetCurrentConnectionPtr) dlsym(hLibrary, "liboie_connectioniterator_getcurrentconnection");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_ConnectionIterator_GetCurrentConnection == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Server_Start = (PLibOIEServer_StartPtr) GetProcAddress(hLibrary, "liboie_server_start");
+		#else // _WIN32
+		pWrapperTable->m_Server_Start = (PLibOIEServer_StartPtr) dlsym(hLibrary, "liboie_server_start");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Server_Start == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Server_Stop = (PLibOIEServer_StopPtr) GetProcAddress(hLibrary, "liboie_server_stop");
+		#else // _WIN32
+		pWrapperTable->m_Server_Stop = (PLibOIEServer_StopPtr) dlsym(hLibrary, "liboie_server_stop");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Server_Stop == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Server_CloseAllConnections = (PLibOIEServer_CloseAllConnectionsPtr) GetProcAddress(hLibrary, "liboie_server_closeallconnections");
+		#else // _WIN32
+		pWrapperTable->m_Server_CloseAllConnections = (PLibOIEServer_CloseAllConnectionsPtr) dlsym(hLibrary, "liboie_server_closeallconnections");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Server_CloseAllConnections == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Server_SetThreadCount = (PLibOIEServer_SetThreadCountPtr) GetProcAddress(hLibrary, "liboie_server_setthreadcount");
+		#else // _WIN32
+		pWrapperTable->m_Server_SetThreadCount = (PLibOIEServer_SetThreadCountPtr) dlsym(hLibrary, "liboie_server_setthreadcount");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Server_SetThreadCount == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Server_SetBufferSize = (PLibOIEServer_SetBufferSizePtr) GetProcAddress(hLibrary, "liboie_server_setbuffersize");
+		#else // _WIN32
+		pWrapperTable->m_Server_SetBufferSize = (PLibOIEServer_SetBufferSizePtr) dlsym(hLibrary, "liboie_server_setbuffersize");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Server_SetBufferSize == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Server_AcceptDevice = (PLibOIEServer_AcceptDevicePtr) GetProcAddress(hLibrary, "liboie_server_acceptdevice");
+		#else // _WIN32
+		pWrapperTable->m_Server_AcceptDevice = (PLibOIEServer_AcceptDevicePtr) dlsym(hLibrary, "liboie_server_acceptdevice");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Server_AcceptDevice == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Server_UnAcceptDevice = (PLibOIEServer_UnAcceptDevicePtr) GetProcAddress(hLibrary, "liboie_server_unacceptdevice");
+		#else // _WIN32
+		pWrapperTable->m_Server_UnAcceptDevice = (PLibOIEServer_UnAcceptDevicePtr) dlsym(hLibrary, "liboie_server_unacceptdevice");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Server_UnAcceptDevice == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Server_ClearAcceptedDevices = (PLibOIEServer_ClearAcceptedDevicesPtr) GetProcAddress(hLibrary, "liboie_server_clearaccepteddevices");
+		#else // _WIN32
+		pWrapperTable->m_Server_ClearAcceptedDevices = (PLibOIEServer_ClearAcceptedDevicesPtr) dlsym(hLibrary, "liboie_server_clearaccepteddevices");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Server_ClearAcceptedDevices == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Server_ListConnections = (PLibOIEServer_ListConnectionsPtr) GetProcAddress(hLibrary, "liboie_server_listconnections");
+		#else // _WIN32
+		pWrapperTable->m_Server_ListConnections = (PLibOIEServer_ListConnectionsPtr) dlsym(hLibrary, "liboie_server_listconnections");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Server_ListConnections == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Server_SetConnectionAcceptedCallback = (PLibOIEServer_SetConnectionAcceptedCallbackPtr) GetProcAddress(hLibrary, "liboie_server_setconnectionacceptedcallback");
+		#else // _WIN32
+		pWrapperTable->m_Server_SetConnectionAcceptedCallback = (PLibOIEServer_SetConnectionAcceptedCallbackPtr) dlsym(hLibrary, "liboie_server_setconnectionacceptedcallback");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Server_SetConnectionAcceptedCallback == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Server_SetConnectionRejectedCallback = (PLibOIEServer_SetConnectionRejectedCallbackPtr) GetProcAddress(hLibrary, "liboie_server_setconnectionrejectedcallback");
+		#else // _WIN32
+		pWrapperTable->m_Server_SetConnectionRejectedCallback = (PLibOIEServer_SetConnectionRejectedCallbackPtr) dlsym(hLibrary, "liboie_server_setconnectionrejectedcallback");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Server_SetConnectionRejectedCallback == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_GetVersion = (PLibOIEGetVersionPtr) GetProcAddress(hLibrary, "liboie_getversion");
+		#else // _WIN32
+		pWrapperTable->m_GetVersion = (PLibOIEGetVersionPtr) dlsym(hLibrary, "liboie_getversion");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_GetVersion == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_GetLastError = (PLibOIEGetLastErrorPtr) GetProcAddress(hLibrary, "liboie_getlasterror");
+		#else // _WIN32
+		pWrapperTable->m_GetLastError = (PLibOIEGetLastErrorPtr) dlsym(hLibrary, "liboie_getlasterror");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_GetLastError == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_ReleaseInstance = (PLibOIEReleaseInstancePtr) GetProcAddress(hLibrary, "liboie_releaseinstance");
+		#else // _WIN32
+		pWrapperTable->m_ReleaseInstance = (PLibOIEReleaseInstancePtr) dlsym(hLibrary, "liboie_releaseinstance");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_ReleaseInstance == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_AcquireInstance = (PLibOIEAcquireInstancePtr) GetProcAddress(hLibrary, "liboie_acquireinstance");
+		#else // _WIN32
+		pWrapperTable->m_AcquireInstance = (PLibOIEAcquireInstancePtr) dlsym(hLibrary, "liboie_acquireinstance");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_AcquireInstance == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_GetSymbolLookupMethod = (PLibOIEGetSymbolLookupMethodPtr) GetProcAddress(hLibrary, "liboie_getsymbollookupmethod");
+		#else // _WIN32
+		pWrapperTable->m_GetSymbolLookupMethod = (PLibOIEGetSymbolLookupMethodPtr) dlsym(hLibrary, "liboie_getsymbollookupmethod");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_GetSymbolLookupMethod == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_CreateServer = (PLibOIECreateServerPtr) GetProcAddress(hLibrary, "liboie_createserver");
+		#else // _WIN32
+		pWrapperTable->m_CreateServer = (PLibOIECreateServerPtr) dlsym(hLibrary, "liboie_createserver");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_CreateServer == nullptr)
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		pWrapperTable->m_LibraryHandle = hLibrary;
+		return LIBOIE_SUCCESS;
+	}
+
+	inline LibOIEResult CWrapper::loadWrapperTableFromSymbolLookupMethod(sLibOIEDynamicWrapperTable * pWrapperTable, void* pSymbolLookupMethod)
+{
+		if (pWrapperTable == nullptr)
+			return LIBOIE_ERROR_INVALIDPARAM;
+		if (pSymbolLookupMethod == nullptr)
+			return LIBOIE_ERROR_INVALIDPARAM;
+		
+		typedef LibOIEResult(*SymbolLookupType)(const char*, void**);
+		
+		SymbolLookupType pLookup = (SymbolLookupType)pSymbolLookupMethod;
+		
+		LibOIEResult eLookupError = LIBOIE_SUCCESS;
+		eLookupError = (*pLookup)("liboie_iterator_movenext", (void**)&(pWrapperTable->m_Iterator_MoveNext));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Iterator_MoveNext == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_iterator_moveprevious", (void**)&(pWrapperTable->m_Iterator_MovePrevious));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Iterator_MovePrevious == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_iterator_getcurrent", (void**)&(pWrapperTable->m_Iterator_GetCurrent));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Iterator_GetCurrent == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_iterator_clone", (void**)&(pWrapperTable->m_Iterator_Clone));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Iterator_Clone == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_iterator_count", (void**)&(pWrapperTable->m_Iterator_Count));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Iterator_Count == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_datapackage_getrawpayload", (void**)&(pWrapperTable->m_DataPackage_GetRawPayload));
+		if ( (eLookupError != 0) || (pWrapperTable->m_DataPackage_GetRawPayload == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_datapackage_release", (void**)&(pWrapperTable->m_DataPackage_Release));
+		if ( (eLookupError != 0) || (pWrapperTable->m_DataPackage_Release == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_pyrodatapackageiterator_getcurrentpyrodatapackage", (void**)&(pWrapperTable->m_PyroDataPackageIterator_GetCurrentPyroDataPackage));
+		if ( (eLookupError != 0) || (pWrapperTable->m_PyroDataPackageIterator_GetCurrentPyroDataPackage == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_octdatapackageiterator_getcurrentoctdatapackage", (void**)&(pWrapperTable->m_OctDataPackageIterator_GetCurrentOctDataPackage));
+		if ( (eLookupError != 0) || (pWrapperTable->m_OctDataPackageIterator_GetCurrentOctDataPackage == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_remotefunctioncall_getfunctionname", (void**)&(pWrapperTable->m_RemoteFunctionCall_GetFunctionName));
+		if ( (eLookupError != 0) || (pWrapperTable->m_RemoteFunctionCall_GetFunctionName == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_remotefunctioncall_addparameter", (void**)&(pWrapperTable->m_RemoteFunctionCall_AddParameter));
+		if ( (eLookupError != 0) || (pWrapperTable->m_RemoteFunctionCall_AddParameter == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_remotefunctioncall_send", (void**)&(pWrapperTable->m_RemoteFunctionCall_Send));
+		if ( (eLookupError != 0) || (pWrapperTable->m_RemoteFunctionCall_Send == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_disconnect", (void**)&(pWrapperTable->m_Connection_Disconnect));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_Disconnect == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_setrequesttimeout", (void**)&(pWrapperTable->m_Connection_SetRequestTimeout));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_SetRequestTimeout == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_setmaxerrorcount", (void**)&(pWrapperTable->m_Connection_SetMaxErrorCount));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_SetMaxErrorCount == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_setmaxmemorycount", (void**)&(pWrapperTable->m_Connection_SetMaxMemoryCount));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_SetMaxMemoryCount == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_setbufferfile", (void**)&(pWrapperTable->m_Connection_SetBufferFile));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_SetBufferFile == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_unsetbufferfile", (void**)&(pWrapperTable->m_Connection_UnsetBufferFile));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_UnsetBufferFile == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_setcheckaliveinterval", (void**)&(pWrapperTable->m_Connection_SetCheckAliveInterval));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_SetCheckAliveInterval == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_retrievefirmwareversion", (void**)&(pWrapperTable->m_Connection_RetrieveFirmwareVersion));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_RetrieveFirmwareVersion == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_updatefirmware", (void**)&(pWrapperTable->m_Connection_UpdateFirmware));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_UpdateFirmware == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_startfirmware", (void**)&(pWrapperTable->m_Connection_StartFirmware));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_StartFirmware == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_stopfirmware", (void**)&(pWrapperTable->m_Connection_StopFirmware));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_StopFirmware == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_setconnectionerrorcallback", (void**)&(pWrapperTable->m_Connection_SetConnectionErrorCallback));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_SetConnectionErrorCallback == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_clearerrors", (void**)&(pWrapperTable->m_Connection_ClearErrors));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_ClearErrors == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_geterrorcount", (void**)&(pWrapperTable->m_Connection_GetErrorCount));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_GetErrorCount == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_geterror", (void**)&(pWrapperTable->m_Connection_GetError));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_GetError == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_createremotefunctioncall", (void**)&(pWrapperTable->m_Connection_CreateRemoteFunctionCall));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_CreateRemoteFunctionCall == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_getbufferedpyropackages", (void**)&(pWrapperTable->m_Connection_GetBufferedPyroPackages));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_GetBufferedPyroPackages == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connection_getbufferedoctpackages", (void**)&(pWrapperTable->m_Connection_GetBufferedOctPackages));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Connection_GetBufferedOctPackages == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_connectioniterator_getcurrentconnection", (void**)&(pWrapperTable->m_ConnectionIterator_GetCurrentConnection));
+		if ( (eLookupError != 0) || (pWrapperTable->m_ConnectionIterator_GetCurrentConnection == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_server_start", (void**)&(pWrapperTable->m_Server_Start));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Server_Start == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_server_stop", (void**)&(pWrapperTable->m_Server_Stop));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Server_Stop == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_server_closeallconnections", (void**)&(pWrapperTable->m_Server_CloseAllConnections));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Server_CloseAllConnections == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_server_setthreadcount", (void**)&(pWrapperTable->m_Server_SetThreadCount));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Server_SetThreadCount == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_server_setbuffersize", (void**)&(pWrapperTable->m_Server_SetBufferSize));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Server_SetBufferSize == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_server_acceptdevice", (void**)&(pWrapperTable->m_Server_AcceptDevice));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Server_AcceptDevice == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_server_unacceptdevice", (void**)&(pWrapperTable->m_Server_UnAcceptDevice));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Server_UnAcceptDevice == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_server_clearaccepteddevices", (void**)&(pWrapperTable->m_Server_ClearAcceptedDevices));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Server_ClearAcceptedDevices == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_server_listconnections", (void**)&(pWrapperTable->m_Server_ListConnections));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Server_ListConnections == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_server_setconnectionacceptedcallback", (void**)&(pWrapperTable->m_Server_SetConnectionAcceptedCallback));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Server_SetConnectionAcceptedCallback == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_server_setconnectionrejectedcallback", (void**)&(pWrapperTable->m_Server_SetConnectionRejectedCallback));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Server_SetConnectionRejectedCallback == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_getversion", (void**)&(pWrapperTable->m_GetVersion));
+		if ( (eLookupError != 0) || (pWrapperTable->m_GetVersion == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_getlasterror", (void**)&(pWrapperTable->m_GetLastError));
+		if ( (eLookupError != 0) || (pWrapperTable->m_GetLastError == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_releaseinstance", (void**)&(pWrapperTable->m_ReleaseInstance));
+		if ( (eLookupError != 0) || (pWrapperTable->m_ReleaseInstance == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_acquireinstance", (void**)&(pWrapperTable->m_AcquireInstance));
+		if ( (eLookupError != 0) || (pWrapperTable->m_AcquireInstance == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_getsymbollookupmethod", (void**)&(pWrapperTable->m_GetSymbolLookupMethod));
+		if ( (eLookupError != 0) || (pWrapperTable->m_GetSymbolLookupMethod == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("liboie_createserver", (void**)&(pWrapperTable->m_CreateServer));
+		if ( (eLookupError != 0) || (pWrapperTable->m_CreateServer == nullptr) )
+			return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		return LIBOIE_SUCCESS;
+}
+
+	
+	
+	/**
+	 * Method definitions for class CBase
+	 */
+	
+	/**
+	 * Method definitions for class CIterator
+	 */
+	
+	/**
+	* CIterator::MoveNext - Iterates to the next resource in the list.
+	* @return Iterates to the next resource in the list.
+	*/
+	bool CIterator::MoveNext()
+	{
+		bool resultHasNext = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Iterator_MoveNext(m_pHandle, &resultHasNext));
+		
+		return resultHasNext;
+	}
+	
+	/**
+	* CIterator::MovePrevious - Iterates to the previous resource in the list.
+	* @return Iterates to the previous resource in the list.
+	*/
+	bool CIterator::MovePrevious()
+	{
+		bool resultHasPrevious = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Iterator_MovePrevious(m_pHandle, &resultHasPrevious));
+		
+		return resultHasPrevious;
+	}
+	
+	/**
+	* CIterator::GetCurrent - Returns the resource the iterator points at.
+	* @return returns the resource instance.
+	*/
+	PBase CIterator::GetCurrent()
+	{
+		LibOIEHandle hCurrentInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_Iterator_GetCurrent(m_pHandle, &hCurrentInstance));
+		
+		if (!hCurrentInstance) {
+			CheckError(LIBOIE_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CBase>(m_pWrapper, hCurrentInstance);
+	}
+	
+	/**
+	* CIterator::Clone - Creates a new resource iterator with the same resource list.
+	* @return returns the cloned Iterator instance
+	*/
+	PIterator CIterator::Clone()
+	{
+		LibOIEHandle hOutIterator = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_Iterator_Clone(m_pHandle, &hOutIterator));
+		
+		if (!hOutIterator) {
+			CheckError(LIBOIE_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CIterator>(m_pWrapper, hOutIterator);
+	}
+	
+	/**
+	* CIterator::Count - Returns the number of resoucres the iterator captures.
+	* @return returns the number of resources the iterator captures.
+	*/
+	LibOIE_uint64 CIterator::Count()
+	{
+		LibOIE_uint64 resultCount = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Iterator_Count(m_pHandle, &resultCount));
+		
+		return resultCount;
+	}
+	
+	/**
+	 * Method definitions for class CDataPackage
+	 */
+	
+	/**
+	* CDataPackage::GetRawPayload - Returns the raw payload.
+	* @param[out] PayloadBuffer - Raw payload data.
+	*/
+	void CDataPackage::GetRawPayload(std::vector<LibOIE_uint8> & PayloadBuffer)
+	{
+		LibOIE_uint64 elementsNeededPayload = 0;
+		LibOIE_uint64 elementsWrittenPayload = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_DataPackage_GetRawPayload(m_pHandle, 0, &elementsNeededPayload, nullptr));
+		PayloadBuffer.resize((size_t) elementsNeededPayload);
+		CheckError(m_pWrapper->m_WrapperTable.m_DataPackage_GetRawPayload(m_pHandle, elementsNeededPayload, &elementsWrittenPayload, PayloadBuffer.data()));
+	}
+	
+	/**
+	* CDataPackage::Release - Releases memory of the data package.
+	*/
+	void CDataPackage::Release()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_DataPackage_Release(m_pHandle));
+	}
+	
+	/**
+	 * Method definitions for class CPyroDataPackage
+	 */
+	
+	/**
+	 * Method definitions for class CPyroDataPackageIterator
+	 */
+	
+	/**
+	* CPyroDataPackageIterator::GetCurrentPyroDataPackage - Returns the data package the iterator points at.
+	* @return returns the data package instance.
+	*/
+	PPyroDataPackage CPyroDataPackageIterator::GetCurrentPyroDataPackage()
+	{
+		LibOIEHandle hCurrentInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_PyroDataPackageIterator_GetCurrentPyroDataPackage(m_pHandle, &hCurrentInstance));
+		
+		if (!hCurrentInstance) {
+			CheckError(LIBOIE_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CPyroDataPackage>(m_pWrapper, hCurrentInstance);
+	}
+	
+	/**
+	 * Method definitions for class COctDataPackage
+	 */
+	
+	/**
+	 * Method definitions for class COctDataPackageIterator
+	 */
+	
+	/**
+	* COctDataPackageIterator::GetCurrentOctDataPackage - Returns the data package the iterator points at.
+	* @return returns the data package instance.
+	*/
+	POctDataPackage COctDataPackageIterator::GetCurrentOctDataPackage()
+	{
+		LibOIEHandle hCurrentInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_OctDataPackageIterator_GetCurrentOctDataPackage(m_pHandle, &hCurrentInstance));
+		
+		if (!hCurrentInstance) {
+			CheckError(LIBOIE_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<COctDataPackage>(m_pWrapper, hCurrentInstance);
+	}
+	
+	/**
+	 * Method definitions for class CRemoteFunctionCall
+	 */
+	
+	/**
+	* CRemoteFunctionCall::GetFunctionName - Returns function name
+	* @return Function Name.
+	*/
+	std::string CRemoteFunctionCall::GetFunctionName()
+	{
+		LibOIE_uint32 bytesNeededFunctionName = 0;
+		LibOIE_uint32 bytesWrittenFunctionName = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_RemoteFunctionCall_GetFunctionName(m_pHandle, 0, &bytesNeededFunctionName, nullptr));
+		std::vector<char> bufferFunctionName(bytesNeededFunctionName);
+		CheckError(m_pWrapper->m_WrapperTable.m_RemoteFunctionCall_GetFunctionName(m_pHandle, bytesNeededFunctionName, &bytesWrittenFunctionName, &bufferFunctionName[0]));
+		
+		return std::string(&bufferFunctionName[0]);
+	}
+	
+	/**
+	* CRemoteFunctionCall::AddParameter - Adds a function call parameter
+	* @param[in] sParameter - Parameter of the call.
+	*/
+	void CRemoteFunctionCall::AddParameter(const std::string & sParameter)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_RemoteFunctionCall_AddParameter(m_pHandle, sParameter.c_str()));
+	}
+	
+	/**
+	* CRemoteFunctionCall::Send - Sends a remote function call over its connection.
+	* @return Returns result if successful.
+	*/
+	std::string CRemoteFunctionCall::Send()
+	{
+		LibOIE_uint32 bytesNeededResultString = 0;
+		LibOIE_uint32 bytesWrittenResultString = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_RemoteFunctionCall_Send(m_pHandle, 0, &bytesNeededResultString, nullptr));
+		std::vector<char> bufferResultString(bytesNeededResultString);
+		CheckError(m_pWrapper->m_WrapperTable.m_RemoteFunctionCall_Send(m_pHandle, bytesNeededResultString, &bytesWrittenResultString, &bufferResultString[0]));
+		
+		return std::string(&bufferResultString[0]);
+	}
+	
+	/**
+	 * Method definitions for class CConnection
+	 */
+	
+	/**
+	* CConnection::Disconnect - Disconnects and closes the connection
+	*/
+	void CConnection::Disconnect()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_Disconnect(m_pHandle));
+	}
+	
+	/**
+	* CConnection::SetRequestTimeout - Sets timeout value for each poll request below.
+	* @param[in] nTimeout - Timeout in milliseconds. Default is 1000ms. Minimum 10ms, maximum 1000000ms.
+	*/
+	void CConnection::SetRequestTimeout(const LibOIE_uint32 nTimeout)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_SetRequestTimeout(m_pHandle, nTimeout));
+	}
+	
+	/**
+	* CConnection::SetMaxErrorCount - Sets the maximum error messages that can be received before the connection is terminated.
+	* @param[in] nErrorCount - Max Error count. Default is 1024. Minimum 16, maximum 65535.
+	*/
+	void CConnection::SetMaxErrorCount(const LibOIE_uint32 nErrorCount)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_SetMaxErrorCount(m_pHandle, nErrorCount));
+	}
+	
+	/**
+	* CConnection::SetMaxMemoryCount - Sets the maximum memory buffer the data packets can use before the connection is terminated.
+	* @param[in] nMaxMemoryCount - Max memory count in bytes. Default is 1MB. Minimum 1kB, maximum 1GB.
+	*/
+	void CConnection::SetMaxMemoryCount(const LibOIE_uint32 nMaxMemoryCount)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_SetMaxMemoryCount(m_pHandle, nMaxMemoryCount));
+	}
+	
+	/**
+	* CConnection::SetBufferFile - Sets a temporary filename to which the packets are buffered.
+	* @param[in] sFileName - Filename which should be used as buffer.
+	* @param[in] nMaxMemoryCount - Max memory count in bytes. Default is 1MB. Minimum 1kB, maximum 1TB.
+	*/
+	void CConnection::SetBufferFile(const std::string & sFileName, const LibOIE_uint64 nMaxMemoryCount)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_SetBufferFile(m_pHandle, sFileName.c_str(), nMaxMemoryCount));
+	}
+	
+	/**
+	* CConnection::UnsetBufferFile - Stops writing to disk.
+	*/
+	void CConnection::UnsetBufferFile()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_UnsetBufferFile(m_pHandle));
+	}
+	
+	/**
+	* CConnection::SetCheckAliveInterval - Sets check alive interval. 0ms means no check alive request is sent.
+	* @param[in] nCheckAliveInterval - Timeout in milliseconds. Default is 1000ms. Max value is 1000000ms.
+	*/
+	void CConnection::SetCheckAliveInterval(const LibOIE_uint32 nCheckAliveInterval)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_SetCheckAliveInterval(m_pHandle, nCheckAliveInterval));
+	}
+	
+	/**
+	* CConnection::RetrieveFirmwareVersion - Retrieves Firmware Version. Fails if firmware is not existing.
+	* @param[in] sFirmwareName - Name of the firmware to retrieve.
+	* @param[out] sFirmwareVersion - Version of the requested firmware.
+	* @param[out] sFilename - Filename of the requested firmware.
+	* @param[out] sFiledate - Timestamp of the requested firmware in ISO8601 Time.
+	* @param[out] sSHA256 - Checksum of the requested firmware.
+	*/
+	void CConnection::RetrieveFirmwareVersion(const std::string & sFirmwareName, std::string & sFirmwareVersion, std::string & sFilename, std::string & sFiledate, std::string & sSHA256)
+	{
+		LibOIE_uint32 bytesNeededFirmwareVersion = 0;
+		LibOIE_uint32 bytesWrittenFirmwareVersion = 0;
+		LibOIE_uint32 bytesNeededFilename = 0;
+		LibOIE_uint32 bytesWrittenFilename = 0;
+		LibOIE_uint32 bytesNeededFiledate = 0;
+		LibOIE_uint32 bytesWrittenFiledate = 0;
+		LibOIE_uint32 bytesNeededSHA256 = 0;
+		LibOIE_uint32 bytesWrittenSHA256 = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_RetrieveFirmwareVersion(m_pHandle, sFirmwareName.c_str(), 0, &bytesNeededFirmwareVersion, nullptr, 0, &bytesNeededFilename, nullptr, 0, &bytesNeededFiledate, nullptr, 0, &bytesNeededSHA256, nullptr));
+		std::vector<char> bufferFirmwareVersion(bytesNeededFirmwareVersion);
+		std::vector<char> bufferFilename(bytesNeededFilename);
+		std::vector<char> bufferFiledate(bytesNeededFiledate);
+		std::vector<char> bufferSHA256(bytesNeededSHA256);
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_RetrieveFirmwareVersion(m_pHandle, sFirmwareName.c_str(), bytesNeededFirmwareVersion, &bytesWrittenFirmwareVersion, &bufferFirmwareVersion[0], bytesNeededFilename, &bytesWrittenFilename, &bufferFilename[0], bytesNeededFiledate, &bytesWrittenFiledate, &bufferFiledate[0], bytesNeededSHA256, &bytesWrittenSHA256, &bufferSHA256[0]));
+		sFirmwareVersion = std::string(&bufferFirmwareVersion[0]);
+		sFilename = std::string(&bufferFilename[0]);
+		sFiledate = std::string(&bufferFiledate[0]);
+		sSHA256 = std::string(&bufferSHA256[0]);
+	}
+	
+	/**
+	* CConnection::UpdateFirmware - Retrieves Firmware Version. Fails if firmware is not existing.
+	* @param[in] sFirmwareName - Name of the new firmware.
+	* @param[in] sFirmwareVersion - Version of the new firmware.
+	* @param[in] sFileName - Filename of the new firmware.
+	* @param[in] sFileDate - Timestamp of the requested firmware in ISO8601 Time.
+	* @param[in] sSHA256 - Checksum of the new firmware.
+	* @param[in] BinaryDataBuffer - Blob of new firmware.
+	*/
+	void CConnection::UpdateFirmware(const std::string & sFirmwareName, const std::string & sFirmwareVersion, const std::string & sFileName, const std::string & sFileDate, const std::string & sSHA256, const CInputVector<LibOIE_uint8> & BinaryDataBuffer)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_UpdateFirmware(m_pHandle, sFirmwareName.c_str(), sFirmwareVersion.c_str(), sFileName.c_str(), sFileDate.c_str(), sSHA256.c_str(), (LibOIE_uint64)BinaryDataBuffer.size(), BinaryDataBuffer.data()));
+	}
+	
+	/**
+	* CConnection::StartFirmware - Starts firmware on Open Interface Extension.
+	* @param[in] sFileName - Filename of the firmware to start.
+	* @return Firmware successfully started.
+	*/
+	bool CConnection::StartFirmware(const std::string & sFileName)
+	{
+		bool resultSuccess = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_StartFirmware(m_pHandle, sFileName.c_str(), &resultSuccess));
+		
+		return resultSuccess;
+	}
+	
+	/**
+	* CConnection::StopFirmware - Stops firmware on Open Interface Extension.
+	* @param[in] sFileName - Filename of the firmware to stop.
+	* @return Firmware successfully stopped.
+	*/
+	bool CConnection::StopFirmware(const std::string & sFileName)
+	{
+		bool resultSuccess = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_StopFirmware(m_pHandle, sFileName.c_str(), &resultSuccess));
+		
+		return resultSuccess;
+	}
+	
+	/**
+	* CConnection::SetConnectionErrorCallback - sets a callback that triggers when a connection error occured.
+	* @param[in] pCallback - callback pointer.
+	*/
+	void CConnection::SetConnectionErrorCallback(const ConnectionErrorCallback pCallback)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_SetConnectionErrorCallback(m_pHandle, pCallback));
+	}
+	
+	/**
+	* CConnection::ClearErrors - clears the error log.
+	*/
+	void CConnection::ClearErrors()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_ClearErrors(m_pHandle));
+	}
+	
+	/**
+	* CConnection::GetErrorCount - Returns the list of errors in the error log.
+	* @return Errors in the error log.
+	*/
+	LibOIE_uint32 CConnection::GetErrorCount()
+	{
+		LibOIE_uint32 resultErrorCount = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_GetErrorCount(m_pHandle, &resultErrorCount));
+		
+		return resultErrorCount;
+	}
+	
+	/**
+	* CConnection::GetError - Returns an error message of the error log
+	* @param[in] nErrorIndex - Index of the error.
+	* @param[out] sErrorMessage - Message of the error.
+	* @param[out] sTimestamp - ISO8601 Time when the error was reported.
+	*/
+	void CConnection::GetError(const LibOIE_uint32 nErrorIndex, std::string & sErrorMessage, std::string & sTimestamp)
+	{
+		LibOIE_uint32 bytesNeededErrorMessage = 0;
+		LibOIE_uint32 bytesWrittenErrorMessage = 0;
+		LibOIE_uint32 bytesNeededTimestamp = 0;
+		LibOIE_uint32 bytesWrittenTimestamp = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_GetError(m_pHandle, nErrorIndex, 0, &bytesNeededErrorMessage, nullptr, 0, &bytesNeededTimestamp, nullptr));
+		std::vector<char> bufferErrorMessage(bytesNeededErrorMessage);
+		std::vector<char> bufferTimestamp(bytesNeededTimestamp);
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_GetError(m_pHandle, nErrorIndex, bytesNeededErrorMessage, &bytesWrittenErrorMessage, &bufferErrorMessage[0], bytesNeededTimestamp, &bytesWrittenTimestamp, &bufferTimestamp[0]));
+		sErrorMessage = std::string(&bufferErrorMessage[0]);
+		sTimestamp = std::string(&bufferTimestamp[0]);
+	}
+	
+	/**
+	* CConnection::CreateRemoteFunctionCall - Creates a new remote function call.
+	* @param[in] sFunctionName - Function name.
+	* @return Function call instance.
+	*/
+	PRemoteFunctionCall CConnection::CreateRemoteFunctionCall(const std::string & sFunctionName)
+	{
+		LibOIEHandle hInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_CreateRemoteFunctionCall(m_pHandle, sFunctionName.c_str(), &hInstance));
+		
+		if (!hInstance) {
+			CheckError(LIBOIE_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CRemoteFunctionCall>(m_pWrapper, hInstance);
+	}
+	
+	/**
+	* CConnection::GetBufferedPyroPackages - Retrieves currently buffered pyro packages.
+	* @return Iterator of buffered packages.
+	*/
+	PPyroDataPackageIterator CConnection::GetBufferedPyroPackages()
+	{
+		LibOIEHandle hIterator = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_GetBufferedPyroPackages(m_pHandle, &hIterator));
+		
+		if (!hIterator) {
+			CheckError(LIBOIE_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CPyroDataPackageIterator>(m_pWrapper, hIterator);
+	}
+	
+	/**
+	* CConnection::GetBufferedOctPackages - Retrieves currently buffered oct packages.
+	* @return Iterator of buffered packages.
+	*/
+	POctDataPackageIterator CConnection::GetBufferedOctPackages()
+	{
+		LibOIEHandle hIterator = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_Connection_GetBufferedOctPackages(m_pHandle, &hIterator));
+		
+		if (!hIterator) {
+			CheckError(LIBOIE_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<COctDataPackageIterator>(m_pWrapper, hIterator);
+	}
+	
+	/**
+	 * Method definitions for class CConnectionIterator
+	 */
+	
+	/**
+	* CConnectionIterator::GetCurrentConnection - Returns the connection the iterator points at.
+	* @return returns the connection instance.
+	*/
+	PConnection CConnectionIterator::GetCurrentConnection()
+	{
+		LibOIEHandle hCurrentInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_ConnectionIterator_GetCurrentConnection(m_pHandle, &hCurrentInstance));
+		
+		if (!hCurrentInstance) {
+			CheckError(LIBOIE_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CConnection>(m_pWrapper, hCurrentInstance);
+	}
+	
+	/**
+	 * Method definitions for class CServer
+	 */
+	
+	/**
+	* CServer::Start - starts listening for connections.
+	* @param[in] sIPAddress - IP Address to run on
+	* @param[in] nPort - Port to run on
+	* @param[in] bIPv6 - flag if IPv6 should be used
+	*/
+	void CServer::Start(const std::string & sIPAddress, const LibOIE_uint32 nPort, const bool bIPv6)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Server_Start(m_pHandle, sIPAddress.c_str(), nPort, bIPv6));
+	}
+	
+	/**
+	* CServer::Stop - stops listening for connections and disconnects existing ones.
+	*/
+	void CServer::Stop()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Server_Stop(m_pHandle));
+	}
+	
+	/**
+	* CServer::CloseAllConnections - disconnects all connections but does not stop listening.
+	*/
+	void CServer::CloseAllConnections()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Server_CloseAllConnections(m_pHandle));
+	}
+	
+	/**
+	* CServer::SetThreadCount - sets the maximum thread count to use. Must be called before Start
+	* @param[in] nThreadCount - Thread count to use (must be larger than 4, default is 32)
+	*/
+	void CServer::SetThreadCount(const LibOIE_uint32 nThreadCount)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Server_SetThreadCount(m_pHandle, nThreadCount));
+	}
+	
+	/**
+	* CServer::SetBufferSize - sets the receive buffer size
+	* @param[in] nRCVBufferSize - Receive buffer size to use in bytes (must be between 4kB and 1GB, default is 1MB)
+	*/
+	void CServer::SetBufferSize(const LibOIE_uint32 nRCVBufferSize)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Server_SetBufferSize(m_pHandle, nRCVBufferSize));
+	}
+	
+	/**
+	* CServer::AcceptDevice - adds an accepted device
+	* @param[in] sDeviceName - Device name to be accepted. Empty string means all devices.
+	* @param[in] sApplicationName - Application name to be accepted. Empty string means all applications.
+	* @param[in] sVersionName - Version name to be accepted. Empty string means all versions.
+	* @return Returns identifier of acceptance rule.
+	*/
+	LibOIE_uint32 CServer::AcceptDevice(const std::string & sDeviceName, const std::string & sApplicationName, const std::string & sVersionName)
+	{
+		LibOIE_uint32 resultRuleID = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Server_AcceptDevice(m_pHandle, sDeviceName.c_str(), sApplicationName.c_str(), sVersionName.c_str(), &resultRuleID));
+		
+		return resultRuleID;
+	}
+	
+	/**
+	* CServer::UnAcceptDevice - removes an accepted
+	* @param[in] nRuleID - identifier of acceptance rule.
+	*/
+	void CServer::UnAcceptDevice(const LibOIE_uint32 nRuleID)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Server_UnAcceptDevice(m_pHandle, nRuleID));
+	}
+	
+	/**
+	* CServer::ClearAcceptedDevices - clears all accepted device rules
+	*/
+	void CServer::ClearAcceptedDevices()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Server_ClearAcceptedDevices(m_pHandle));
+	}
+	
+	/**
+	* CServer::ListConnections - lists all open connections
+	* @return list of all open connections.
+	*/
+	PConnectionIterator CServer::ListConnections()
+	{
+		LibOIEHandle hConnectionIteratorInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_Server_ListConnections(m_pHandle, &hConnectionIteratorInstance));
+		
+		if (!hConnectionIteratorInstance) {
+			CheckError(LIBOIE_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CConnectionIterator>(m_pWrapper, hConnectionIteratorInstance);
+	}
+	
+	/**
+	* CServer::SetConnectionAcceptedCallback - sets a callback that triggers when a new connection was established.
+	* @param[in] pCallback - callback pointer.
+	*/
+	void CServer::SetConnectionAcceptedCallback(const ConnectionAcceptedCallback pCallback)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Server_SetConnectionAcceptedCallback(m_pHandle, pCallback));
+	}
+	
+	/**
+	* CServer::SetConnectionRejectedCallback - sets a callback that triggers when a new connection was rejected.
+	* @param[in] pCallback - callback pointer.
+	*/
+	void CServer::SetConnectionRejectedCallback(const ConnectionRejectedCallback pCallback)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Server_SetConnectionRejectedCallback(m_pHandle, pCallback));
+	}
+
+} // namespace LibOIE
+
+#endif // __LIBOIE_CPPHEADER_DYNAMIC_CPP
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Headers/CppDynamic/liboie_types.hpp b/Drivers/ScanLabOIE/LibOIE/Headers/CppDynamic/liboie_types.hpp
new file mode 100644
index 00000000..5f378c1e
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Headers/CppDynamic/liboie_types.hpp
@@ -0,0 +1,181 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file with basic types in
+order to allow an easy use of ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBOIE_TYPES_HEADER_CPP
+#define __LIBOIE_TYPES_HEADER_CPP
+
+
+/*************************************************************************************************************************
+ Scalar types definition
+**************************************************************************************************************************/
+
+#ifdef LIBOIE_USELEGACYINTEGERTYPES
+
+typedef unsigned char LibOIE_uint8;
+typedef unsigned short LibOIE_uint16 ;
+typedef unsigned int LibOIE_uint32;
+typedef unsigned long long LibOIE_uint64;
+typedef char LibOIE_int8;
+typedef short LibOIE_int16;
+typedef int LibOIE_int32;
+typedef long long LibOIE_int64;
+
+#else // LIBOIE_USELEGACYINTEGERTYPES
+
+#include <stdint.h>
+
+typedef uint8_t LibOIE_uint8;
+typedef uint16_t LibOIE_uint16;
+typedef uint32_t LibOIE_uint32;
+typedef uint64_t LibOIE_uint64;
+typedef int8_t LibOIE_int8;
+typedef int16_t LibOIE_int16;
+typedef int32_t LibOIE_int32;
+typedef int64_t LibOIE_int64 ;
+
+#endif // LIBOIE_USELEGACYINTEGERTYPES
+
+typedef float LibOIE_single;
+typedef double LibOIE_double;
+
+/*************************************************************************************************************************
+ General type definitions
+**************************************************************************************************************************/
+
+typedef LibOIE_int32 LibOIEResult;
+typedef void * LibOIEHandle;
+typedef void * LibOIE_pvoid;
+
+/*************************************************************************************************************************
+ Version for LibOIE
+**************************************************************************************************************************/
+
+#define LIBOIE_VERSION_MAJOR 1
+#define LIBOIE_VERSION_MINOR 0
+#define LIBOIE_VERSION_MICRO 0
+#define LIBOIE_VERSION_PRERELEASEINFO ""
+#define LIBOIE_VERSION_BUILDINFO ""
+
+/*************************************************************************************************************************
+ Error constants for LibOIE
+**************************************************************************************************************************/
+
+#define LIBOIE_SUCCESS 0
+#define LIBOIE_ERROR_NOTIMPLEMENTED 1
+#define LIBOIE_ERROR_INVALIDPARAM 2
+#define LIBOIE_ERROR_INVALIDCAST 3
+#define LIBOIE_ERROR_BUFFERTOOSMALL 4
+#define LIBOIE_ERROR_GENERICEXCEPTION 5
+#define LIBOIE_ERROR_COULDNOTLOADLIBRARY 6
+#define LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT 7
+#define LIBOIE_ERROR_INCOMPATIBLEBINARYVERSION 8
+
+/*************************************************************************************************************************
+ Error strings for LibOIE
+**************************************************************************************************************************/
+
+inline const char * LIBOIE_GETERRORSTRING (LibOIEResult nErrorCode) {
+  switch (nErrorCode) {
+    case LIBOIE_SUCCESS: return "no error";
+    case LIBOIE_ERROR_NOTIMPLEMENTED: return "functionality not implemented";
+    case LIBOIE_ERROR_INVALIDPARAM: return "an invalid parameter was passed";
+    case LIBOIE_ERROR_INVALIDCAST: return "a type cast failed";
+    case LIBOIE_ERROR_BUFFERTOOSMALL: return "a provided buffer is too small";
+    case LIBOIE_ERROR_GENERICEXCEPTION: return "a generic exception occurred";
+    case LIBOIE_ERROR_COULDNOTLOADLIBRARY: return "the library could not be loaded";
+    case LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT: return "a required exported symbol could not be found in the library";
+    case LIBOIE_ERROR_INCOMPATIBLEBINARYVERSION: return "the version of the binary interface does not match the bindings interface";
+    default: return "unknown error";
+  }
+}
+
+/*************************************************************************************************************************
+ Declaration of handle classes 
+**************************************************************************************************************************/
+
+typedef LibOIEHandle LibOIE_Base;
+typedef LibOIEHandle LibOIE_Iterator;
+typedef LibOIEHandle LibOIE_DataPackage;
+typedef LibOIEHandle LibOIE_PyroDataPackage;
+typedef LibOIEHandle LibOIE_PyroDataPackageIterator;
+typedef LibOIEHandle LibOIE_OctDataPackage;
+typedef LibOIEHandle LibOIE_OctDataPackageIterator;
+typedef LibOIEHandle LibOIE_RemoteFunctionCall;
+typedef LibOIEHandle LibOIE_Connection;
+typedef LibOIEHandle LibOIE_ConnectionIterator;
+typedef LibOIEHandle LibOIE_Server;
+
+namespace LibOIE {
+
+  /*************************************************************************************************************************
+   Declaration of function pointers 
+  **************************************************************************************************************************/
+  
+  /**
+  * ConnectionAcceptedCallback - A callback that is triggered when a device or application has connected.
+  *
+  * @param[in] pConnectionInstance - Returns whether the calculation should be aborted
+  * @param[in] pUserData - Userdata that is passed to the callback function
+  */
+  typedef void(*ConnectionAcceptedCallback)(LibOIE_Connection, LibOIE_pvoid);
+  
+  /**
+  * ConnectionRejectedCallback - A callback that is triggered when a device or application has been denied connecting.
+  *
+  * @param[in] pDeviceName - Device name that was sent.
+  * @param[in] pApplicationName - Application name that was sent.
+  * @param[in] pVersionName - Version name that was sent.
+  * @param[in] pUserData - Userdata that is passed to the callback function
+  */
+  typedef void(*ConnectionRejectedCallback)(const char *, const char *, const char *, LibOIE_pvoid);
+  
+  /**
+  * ConnectionErrorCallback - A callback that is triggered when a connection sends an error state.
+  *
+  * @param[in] pErrorMessage - Error string that was triggered.
+  */
+  typedef void(*ConnectionErrorCallback)(const char *);
+  
+} // namespace LibOIE;
+
+// define legacy C-names for enums, structs and function types
+typedef LibOIE::ConnectionAcceptedCallback LibOIEConnectionAcceptedCallback;
+typedef LibOIE::ConnectionRejectedCallback LibOIEConnectionRejectedCallback;
+typedef LibOIE::ConnectionErrorCallback LibOIEConnectionErrorCallback;
+
+#endif // __LIBOIE_TYPES_HEADER_CPP
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie.cpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie.cpp
new file mode 100644
index 00000000..43775b1a
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie.cpp
@@ -0,0 +1,78 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++ implementation file in order to allow easy
+development of ScanLab Open Interface Extension. It needs to be generated only once.
+
+Interface version: 1.0.0
+
+*/
+
+#include "liboie_abi.hpp"
+#include "liboie_interfaces.hpp"
+#include "liboie_interfaceexception.hpp"
+#include "liboie_server.hpp"
+
+using namespace LibOIE;
+using namespace LibOIE::Impl;
+
+void CWrapper::GetVersion(LibOIE_uint32 & nMajor, LibOIE_uint32 & nMinor, LibOIE_uint32 & nMicro)
+{
+	nMajor = LIBOIE_VERSION_MAJOR;
+	nMinor = LIBOIE_VERSION_MINOR;
+	nMicro = LIBOIE_VERSION_MICRO;
+}
+
+bool CWrapper::GetLastError(IBase* pInstance, std::string & sErrorMessage)
+{
+	if (pInstance) {
+		return pInstance->GetLastErrorMessage (sErrorMessage);
+	} else {
+		return false;
+	}
+}
+
+void CWrapper::ReleaseInstance(IBase* pInstance)
+{
+	IBase::ReleaseBaseClassInterface(pInstance);
+}
+
+void CWrapper::AcquireInstance(IBase* pInstance)
+{
+	IBase::AcquireBaseClassInterface(pInstance);
+}
+
+IServer * CWrapper::CreateServer()
+{
+	return new CServer();
+}
+
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_base.cpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_base.cpp
new file mode 100644
index 00000000..fc00fbdc
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_base.cpp
@@ -0,0 +1,84 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CBase
+
+*/
+
+#include "liboie_base.hpp"
+#include "liboie_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibOIE::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CBase 
+**************************************************************************************************************************/
+
+bool CBase::GetLastErrorMessage(std::string & sErrorMessage)
+{
+	if (m_pLastError.get() != nullptr) {
+		sErrorMessage = *m_pLastError;
+		return true;
+	} else {
+		sErrorMessage = "";
+		return false;
+	}
+}
+
+void CBase::ClearErrorMessages()
+{
+	m_pLastError.reset();
+}
+
+void CBase::RegisterErrorMessage(const std::string & sErrorMessage)
+{
+	if (m_pLastError.get() == nullptr) {
+		m_pLastError.reset(new std::string());
+	}
+	*m_pLastError = sErrorMessage;
+}
+
+void CBase::IncRefCount()
+{
+	++m_nReferenceCount;
+}
+
+bool CBase::DecRefCount()
+{
+	m_nReferenceCount--;
+	if (!m_nReferenceCount) {
+		delete this;
+		return true;
+	}
+	return false;
+}
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_base.hpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_base.hpp
new file mode 100644
index 00000000..ab04e706
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_base.hpp
@@ -0,0 +1,97 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CBase
+
+*/
+
+
+#ifndef __LIBOIE_BASE
+#define __LIBOIE_BASE
+
+#include "liboie_interfaces.hpp"
+#include <vector>
+#include <list>
+#include <memory>
+
+
+// Include custom headers here.
+
+
+namespace LibOIE {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CBase 
+**************************************************************************************************************************/
+
+class CBase : public virtual IBase {
+private:
+
+	std::unique_ptr<std::string> m_pLastError;
+	uint32_t m_nReferenceCount = 1;
+
+	/**
+	* Put private members here.
+	*/
+
+protected:
+
+	/**
+	* Put protected members here.
+	*/
+
+public:
+
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
+
+	bool GetLastErrorMessage(std::string & sErrorMessage) override;
+
+	void ClearErrorMessages() override;
+
+	void RegisterErrorMessage(const std::string & sErrorMessage) override;
+
+	void IncRefCount() override;
+
+	bool DecRefCount() override;
+
+
+	/**
+	* Public member functions to implement.
+	*/
+
+};
+
+} // namespace Impl
+} // namespace LibOIE
+
+#endif // __LIBOIE_BASE
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_connection.cpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_connection.cpp
new file mode 100644
index 00000000..d6eb8c49
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_connection.cpp
@@ -0,0 +1,135 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CConnection
+
+*/
+
+#include "liboie_connection.hpp"
+#include "liboie_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibOIE::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CConnection 
+**************************************************************************************************************************/
+
+void CConnection::Disconnect()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CConnection::SetRequestTimeout(const LibOIE_uint32 nTimeout)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CConnection::SetMaxErrorCount(const LibOIE_uint32 nErrorCount)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CConnection::SetMaxMemoryCount(const LibOIE_uint32 nMaxMemoryCount)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CConnection::SetBufferFile(const std::string & sFileName, const LibOIE_uint64 nMaxMemoryCount)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CConnection::UnsetBufferFile()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CConnection::SetCheckAliveInterval(const LibOIE_uint32 nCheckAliveInterval)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CConnection::RetrieveFirmwareVersion(const std::string & sFirmwareName, std::string & sFirmwareVersion, std::string & sFilename, std::string & sFiledate, std::string & sSHA256)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CConnection::UpdateFirmware(const std::string & sFirmwareName, const std::string & sFirmwareVersion, const std::string & sFileName, const std::string & sFileDate, const std::string & sSHA256, const LibOIE_uint64 nBinaryDataBufferSize, const LibOIE_uint8 * pBinaryDataBuffer)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+bool CConnection::StartFirmware(const std::string & sFileName)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+bool CConnection::StopFirmware(const std::string & sFileName)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CConnection::SetConnectionErrorCallback(const LibOIE::ConnectionErrorCallback pCallback)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CConnection::ClearErrors()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+LibOIE_uint32 CConnection::GetErrorCount()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CConnection::GetError(const LibOIE_uint32 nErrorIndex, std::string & sErrorMessage, std::string & sTimestamp)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+IRemoteFunctionCall * CConnection::CreateRemoteFunctionCall(const std::string & sFunctionName)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+IPyroDataPackageIterator * CConnection::GetBufferedPyroPackages()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+IOctDataPackageIterator * CConnection::GetBufferedOctPackages()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_connection.hpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_connection.hpp
new file mode 100644
index 00000000..c15060b5
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_connection.hpp
@@ -0,0 +1,126 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CConnection
+
+*/
+
+
+#ifndef __LIBOIE_CONNECTION
+#define __LIBOIE_CONNECTION
+
+#include "liboie_interfaces.hpp"
+
+// Parent classes
+#include "liboie_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibOIE {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CConnection 
+**************************************************************************************************************************/
+
+class CConnection : public virtual IConnection, public virtual CBase {
+private:
+
+	/**
+	* Put private members here.
+	*/
+
+protected:
+
+	/**
+	* Put protected members here.
+	*/
+
+public:
+
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
+
+
+	/**
+	* Public member functions to implement.
+	*/
+
+	void Disconnect() override;
+
+	void SetRequestTimeout(const LibOIE_uint32 nTimeout) override;
+
+	void SetMaxErrorCount(const LibOIE_uint32 nErrorCount) override;
+
+	void SetMaxMemoryCount(const LibOIE_uint32 nMaxMemoryCount) override;
+
+	void SetBufferFile(const std::string & sFileName, const LibOIE_uint64 nMaxMemoryCount) override;
+
+	void UnsetBufferFile() override;
+
+	void SetCheckAliveInterval(const LibOIE_uint32 nCheckAliveInterval) override;
+
+	void RetrieveFirmwareVersion(const std::string & sFirmwareName, std::string & sFirmwareVersion, std::string & sFilename, std::string & sFiledate, std::string & sSHA256) override;
+
+	void UpdateFirmware(const std::string & sFirmwareName, const std::string & sFirmwareVersion, const std::string & sFileName, const std::string & sFileDate, const std::string & sSHA256, const LibOIE_uint64 nBinaryDataBufferSize, const LibOIE_uint8 * pBinaryDataBuffer) override;
+
+	bool StartFirmware(const std::string & sFileName) override;
+
+	bool StopFirmware(const std::string & sFileName) override;
+
+	void SetConnectionErrorCallback(const LibOIE::ConnectionErrorCallback pCallback) override;
+
+	void ClearErrors() override;
+
+	LibOIE_uint32 GetErrorCount() override;
+
+	void GetError(const LibOIE_uint32 nErrorIndex, std::string & sErrorMessage, std::string & sTimestamp) override;
+
+	IRemoteFunctionCall * CreateRemoteFunctionCall(const std::string & sFunctionName) override;
+
+	IPyroDataPackageIterator * GetBufferedPyroPackages() override;
+
+	IOctDataPackageIterator * GetBufferedOctPackages() override;
+
+};
+
+} // namespace Impl
+} // namespace LibOIE
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBOIE_CONNECTION
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_connectioniterator.cpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_connectioniterator.cpp
new file mode 100644
index 00000000..3199980f
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_connectioniterator.cpp
@@ -0,0 +1,50 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CConnectionIterator
+
+*/
+
+#include "liboie_connectioniterator.hpp"
+#include "liboie_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibOIE::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CConnectionIterator 
+**************************************************************************************************************************/
+
+IConnection * CConnectionIterator::GetCurrentConnection()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_connectioniterator.hpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_connectioniterator.hpp
new file mode 100644
index 00000000..9b44c7c9
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_connectioniterator.hpp
@@ -0,0 +1,92 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CConnectionIterator
+
+*/
+
+
+#ifndef __LIBOIE_CONNECTIONITERATOR
+#define __LIBOIE_CONNECTIONITERATOR
+
+#include "liboie_interfaces.hpp"
+
+// Parent classes
+#include "liboie_iterator.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibOIE {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CConnectionIterator 
+**************************************************************************************************************************/
+
+class CConnectionIterator : public virtual IConnectionIterator, public virtual CIterator {
+private:
+
+	/**
+	* Put private members here.
+	*/
+
+protected:
+
+	/**
+	* Put protected members here.
+	*/
+
+public:
+
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
+
+
+	/**
+	* Public member functions to implement.
+	*/
+
+	IConnection * GetCurrentConnection() override;
+
+};
+
+} // namespace Impl
+} // namespace LibOIE
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBOIE_CONNECTIONITERATOR
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_datapackage.cpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_datapackage.cpp
new file mode 100644
index 00000000..552fabec
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_datapackage.cpp
@@ -0,0 +1,55 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CDataPackage
+
+*/
+
+#include "liboie_datapackage.hpp"
+#include "liboie_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibOIE::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CDataPackage 
+**************************************************************************************************************************/
+
+void CDataPackage::GetRawPayload(LibOIE_uint64 nPayloadBufferSize, LibOIE_uint64* pPayloadNeededCount, LibOIE_uint8 * pPayloadBuffer)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CDataPackage::Release()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_datapackage.hpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_datapackage.hpp
new file mode 100644
index 00000000..74bedb0b
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_datapackage.hpp
@@ -0,0 +1,94 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CDataPackage
+
+*/
+
+
+#ifndef __LIBOIE_DATAPACKAGE
+#define __LIBOIE_DATAPACKAGE
+
+#include "liboie_interfaces.hpp"
+
+// Parent classes
+#include "liboie_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibOIE {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CDataPackage 
+**************************************************************************************************************************/
+
+class CDataPackage : public virtual IDataPackage, public virtual CBase {
+private:
+
+	/**
+	* Put private members here.
+	*/
+
+protected:
+
+	/**
+	* Put protected members here.
+	*/
+
+public:
+
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
+
+
+	/**
+	* Public member functions to implement.
+	*/
+
+	void GetRawPayload(LibOIE_uint64 nPayloadBufferSize, LibOIE_uint64* pPayloadNeededCount, LibOIE_uint8 * pPayloadBuffer) override;
+
+	void Release() override;
+
+};
+
+} // namespace Impl
+} // namespace LibOIE
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBOIE_DATAPACKAGE
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_iterator.cpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_iterator.cpp
new file mode 100644
index 00000000..026c6fe0
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_iterator.cpp
@@ -0,0 +1,70 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CIterator
+
+*/
+
+#include "liboie_iterator.hpp"
+#include "liboie_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibOIE::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CIterator 
+**************************************************************************************************************************/
+
+bool CIterator::MoveNext()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+bool CIterator::MovePrevious()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+IBase * CIterator::GetCurrent()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+IIterator * CIterator::Clone()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+LibOIE_uint64 CIterator::Count()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_iterator.hpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_iterator.hpp
new file mode 100644
index 00000000..1093addc
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_iterator.hpp
@@ -0,0 +1,100 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CIterator
+
+*/
+
+
+#ifndef __LIBOIE_ITERATOR
+#define __LIBOIE_ITERATOR
+
+#include "liboie_interfaces.hpp"
+
+// Parent classes
+#include "liboie_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibOIE {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CIterator 
+**************************************************************************************************************************/
+
+class CIterator : public virtual IIterator, public virtual CBase {
+private:
+
+	/**
+	* Put private members here.
+	*/
+
+protected:
+
+	/**
+	* Put protected members here.
+	*/
+
+public:
+
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
+
+
+	/**
+	* Public member functions to implement.
+	*/
+
+	bool MoveNext() override;
+
+	bool MovePrevious() override;
+
+	IBase * GetCurrent() override;
+
+	IIterator * Clone() override;
+
+	LibOIE_uint64 Count() override;
+
+};
+
+} // namespace Impl
+} // namespace LibOIE
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBOIE_ITERATOR
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_octdatapackage.cpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_octdatapackage.cpp
new file mode 100644
index 00000000..55fbd00f
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_octdatapackage.cpp
@@ -0,0 +1,45 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of COctDataPackage
+
+*/
+
+#include "liboie_octdatapackage.hpp"
+#include "liboie_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibOIE::Impl;
+
+/*************************************************************************************************************************
+ Class definition of COctDataPackage 
+**************************************************************************************************************************/
+
diff --git a/Implementation/LibMC/libmc_apiresponse.hpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_octdatapackage.hpp
similarity index 57%
rename from Implementation/LibMC/libmc_apiresponse.hpp
rename to Drivers/ScanLabOIE/LibOIE/Implementation/liboie_octdatapackage.hpp
index b2a7e4ed..dc9ce7b4 100644
--- a/Implementation/LibMC/libmc_apiresponse.hpp
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_octdatapackage.hpp
@@ -6,16 +6,16 @@ All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
-	* Redistributions of source code must retain the above copyright
-	  notice, this list of conditions and the following disclaimer.
-	* Redistributions in binary form must reproduce the above copyright
-	  notice, this list of conditions and the following disclaimer in the
-	  documentation and/or other materials provided with the distribution.
-	* Neither the name of the Autodesk Inc. nor the
-	  names of its contributors may be used to endorse or promote products
-	  derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
@@ -26,18 +26,19 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-*/
 
+Abstract: This is the class declaration of COctDataPackage
+
+*/
 
-#ifndef __LIBMC_APIRESPONSE
-#define __LIBMC_APIRESPONSE
 
-#include "libmc_interfaces.hpp"
+#ifndef __LIBOIE_OCTDATAPACKAGE
+#define __LIBOIE_OCTDATAPACKAGE
 
-#include "API/amc_api_response.hpp"
+#include "liboie_interfaces.hpp"
 
 // Parent classes
-#include "libmc_base.hpp"
+#include "liboie_datapackage.hpp"
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4250)
@@ -46,39 +47,44 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // Include custom headers here.
 
 
-namespace LibMC {
+namespace LibOIE {
 namespace Impl {
 
 
 /*************************************************************************************************************************
- Class declaration of CAPIResponse 
+ Class declaration of COctDataPackage 
 **************************************************************************************************************************/
 
-class CAPIResponse : public virtual IAPIResponse, public virtual CBase {
+class COctDataPackage : public virtual IOctDataPackage, public virtual CDataPackage {
 private:
 
-	AMC::PAPIResponse m_pResponse;
-
-	uint32_t m_nErrorCode;
+	/**
+	* Put private members here.
+	*/
 
 protected:
 
-public:
+	/**
+	* Put protected members here.
+	*/
 
-	CAPIResponse (AMC::PAPIResponse pResponse, uint32_t nErrorCode);
+public:
 
-	LibMC_uint32 GetHTTPCode() override;
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
 
-	std::string GetContentType() override;
 
-	void GetData(LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer) override;
+	/**
+	* Public member functions to implement.
+	*/
 
 };
 
 } // namespace Impl
-} // namespace LibMC
+} // namespace LibOIE
 
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
-#endif // __LIBMC_APIRESPONSE
+#endif // __LIBOIE_OCTDATAPACKAGE
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_octdatapackageiterator.cpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_octdatapackageiterator.cpp
new file mode 100644
index 00000000..a98ea82b
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_octdatapackageiterator.cpp
@@ -0,0 +1,50 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of COctDataPackageIterator
+
+*/
+
+#include "liboie_octdatapackageiterator.hpp"
+#include "liboie_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibOIE::Impl;
+
+/*************************************************************************************************************************
+ Class definition of COctDataPackageIterator 
+**************************************************************************************************************************/
+
+IOctDataPackage * COctDataPackageIterator::GetCurrentOctDataPackage()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_octdatapackageiterator.hpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_octdatapackageiterator.hpp
new file mode 100644
index 00000000..2aef70c8
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_octdatapackageiterator.hpp
@@ -0,0 +1,92 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of COctDataPackageIterator
+
+*/
+
+
+#ifndef __LIBOIE_OCTDATAPACKAGEITERATOR
+#define __LIBOIE_OCTDATAPACKAGEITERATOR
+
+#include "liboie_interfaces.hpp"
+
+// Parent classes
+#include "liboie_iterator.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibOIE {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of COctDataPackageIterator 
+**************************************************************************************************************************/
+
+class COctDataPackageIterator : public virtual IOctDataPackageIterator, public virtual CIterator {
+private:
+
+	/**
+	* Put private members here.
+	*/
+
+protected:
+
+	/**
+	* Put protected members here.
+	*/
+
+public:
+
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
+
+
+	/**
+	* Public member functions to implement.
+	*/
+
+	IOctDataPackage * GetCurrentOctDataPackage() override;
+
+};
+
+} // namespace Impl
+} // namespace LibOIE
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBOIE_OCTDATAPACKAGEITERATOR
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_pyrodatapackage.cpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_pyrodatapackage.cpp
new file mode 100644
index 00000000..332f9474
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_pyrodatapackage.cpp
@@ -0,0 +1,45 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CPyroDataPackage
+
+*/
+
+#include "liboie_pyrodatapackage.hpp"
+#include "liboie_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibOIE::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CPyroDataPackage 
+**************************************************************************************************************************/
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_pyrodatapackage.hpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_pyrodatapackage.hpp
new file mode 100644
index 00000000..ec118be5
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_pyrodatapackage.hpp
@@ -0,0 +1,90 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CPyroDataPackage
+
+*/
+
+
+#ifndef __LIBOIE_PYRODATAPACKAGE
+#define __LIBOIE_PYRODATAPACKAGE
+
+#include "liboie_interfaces.hpp"
+
+// Parent classes
+#include "liboie_datapackage.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibOIE {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CPyroDataPackage 
+**************************************************************************************************************************/
+
+class CPyroDataPackage : public virtual IPyroDataPackage, public virtual CDataPackage {
+private:
+
+	/**
+	* Put private members here.
+	*/
+
+protected:
+
+	/**
+	* Put protected members here.
+	*/
+
+public:
+
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
+
+
+	/**
+	* Public member functions to implement.
+	*/
+
+};
+
+} // namespace Impl
+} // namespace LibOIE
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBOIE_PYRODATAPACKAGE
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_pyrodatapackageiterator.cpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_pyrodatapackageiterator.cpp
new file mode 100644
index 00000000..e4c825f4
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_pyrodatapackageiterator.cpp
@@ -0,0 +1,50 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CPyroDataPackageIterator
+
+*/
+
+#include "liboie_pyrodatapackageiterator.hpp"
+#include "liboie_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibOIE::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CPyroDataPackageIterator 
+**************************************************************************************************************************/
+
+IPyroDataPackage * CPyroDataPackageIterator::GetCurrentPyroDataPackage()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_pyrodatapackageiterator.hpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_pyrodatapackageiterator.hpp
new file mode 100644
index 00000000..edd551ab
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_pyrodatapackageiterator.hpp
@@ -0,0 +1,92 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CPyroDataPackageIterator
+
+*/
+
+
+#ifndef __LIBOIE_PYRODATAPACKAGEITERATOR
+#define __LIBOIE_PYRODATAPACKAGEITERATOR
+
+#include "liboie_interfaces.hpp"
+
+// Parent classes
+#include "liboie_iterator.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibOIE {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CPyroDataPackageIterator 
+**************************************************************************************************************************/
+
+class CPyroDataPackageIterator : public virtual IPyroDataPackageIterator, public virtual CIterator {
+private:
+
+	/**
+	* Put private members here.
+	*/
+
+protected:
+
+	/**
+	* Put protected members here.
+	*/
+
+public:
+
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
+
+
+	/**
+	* Public member functions to implement.
+	*/
+
+	IPyroDataPackage * GetCurrentPyroDataPackage() override;
+
+};
+
+} // namespace Impl
+} // namespace LibOIE
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBOIE_PYRODATAPACKAGEITERATOR
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_remotefunctioncall.cpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_remotefunctioncall.cpp
new file mode 100644
index 00000000..097aa406
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_remotefunctioncall.cpp
@@ -0,0 +1,60 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CRemoteFunctionCall
+
+*/
+
+#include "liboie_remotefunctioncall.hpp"
+#include "liboie_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibOIE::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CRemoteFunctionCall 
+**************************************************************************************************************************/
+
+std::string CRemoteFunctionCall::GetFunctionName()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CRemoteFunctionCall::AddParameter(const std::string & sParameter)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+std::string CRemoteFunctionCall::Send()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_remotefunctioncall.hpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_remotefunctioncall.hpp
new file mode 100644
index 00000000..87768e4b
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_remotefunctioncall.hpp
@@ -0,0 +1,96 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CRemoteFunctionCall
+
+*/
+
+
+#ifndef __LIBOIE_REMOTEFUNCTIONCALL
+#define __LIBOIE_REMOTEFUNCTIONCALL
+
+#include "liboie_interfaces.hpp"
+
+// Parent classes
+#include "liboie_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibOIE {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CRemoteFunctionCall 
+**************************************************************************************************************************/
+
+class CRemoteFunctionCall : public virtual IRemoteFunctionCall, public virtual CBase {
+private:
+
+	/**
+	* Put private members here.
+	*/
+
+protected:
+
+	/**
+	* Put protected members here.
+	*/
+
+public:
+
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
+
+
+	/**
+	* Public member functions to implement.
+	*/
+
+	std::string GetFunctionName() override;
+
+	void AddParameter(const std::string & sParameter) override;
+
+	std::string Send() override;
+
+};
+
+} // namespace Impl
+} // namespace LibOIE
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBOIE_REMOTEFUNCTIONCALL
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_server.cpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_server.cpp
new file mode 100644
index 00000000..277d3318
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_server.cpp
@@ -0,0 +1,161 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CServer
+
+*/
+
+#include "liboie_server.hpp"
+#include "liboie_interfaceexception.hpp"
+
+// Include custom headers here.
+#include <brynet/net/EventLoop.hpp>
+#include <brynet/net/TcpService.hpp>
+#include <brynet/net/wrapper/ServiceBuilder.hpp>
+#include <brynet/base/AppStatus.hpp>
+
+using namespace LibOIE::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CServer 
+**************************************************************************************************************************/
+
+CServer::CServer()
+    : m_nThreadCount (LIBOIE_THREADCOUNT_DEFAULT), m_nReceiveBufferSize (LIBOIE_RECEIVEBUFFERSIZE_DEFAULT)
+{
+
+}
+
+
+void CServer::Start(const std::string& sIPAddress, const LibOIE_uint32 nPort, const bool bIPv6) 
+{
+
+
+    m_pService = brynet::net::TcpService::Create();
+
+    m_pService->startWorkerThread(m_nThreadCount, nullptr);
+
+    auto enterCallback = [](const  brynet::net::TcpConnection::Ptr& session) {
+        //total_client_num++;
+
+        session->setDataCallback([session](const char* buffer, size_t len) {
+            session->send(buffer, len);
+            //TotalRecvSize += len;
+            //total_packet_num++;
+            return len;
+        });
+
+        session->setDisConnectCallback([](const  brynet::net::TcpConnection::Ptr& session) {
+            (void)session;
+            //total_client_num--;
+        });
+
+    };
+
+
+    m_pListener = std::make_shared<brynet::net::wrapper::ListenerBuilder>();
+    m_pListener->configureService(m_pService)
+        .configureSocketOptions({
+            [](brynet::net::TcpSocket& socket) {
+                socket.setNodelay();
+            }
+            })
+        .configureConnectionOptions({
+            brynet::net::AddSocketOption::WithMaxRecvBufferSize(m_nReceiveBufferSize),
+            brynet::net::AddSocketOption::AddEnterCallback(enterCallback)
+            })
+                .configureListen([=](brynet::net::wrapper::BuildListenConfig config) {
+                config.setAddr (bIPv6, sIPAddress, nPort);
+            })
+                .asyncRun();
+
+}
+
+
+
+void CServer::Stop()
+{
+
+}
+
+void CServer::SetThreadCount(const LibOIE_uint32 nThreadCount)
+{
+    if (nThreadCount < LIBOIE_THREADCOUNT_MIN)
+        throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDPARAM);
+    if (nThreadCount > LIBOIE_THREADCOUNT_MAX)
+        throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDPARAM);
+    m_nThreadCount = nThreadCount;
+}
+
+void CServer::SetBufferSize(const LibOIE_uint32 nRCVBufferSize)
+{
+    if (nRCVBufferSize < LIBOIE_RECEIVEBUFFERSIZE_MIN)
+        throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDPARAM);
+    if (nRCVBufferSize > LIBOIE_RECEIVEBUFFERSIZE_MAX)
+        throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDPARAM);
+
+    m_nReceiveBufferSize = nRCVBufferSize;
+}
+
+void CServer::CloseAllConnections()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+
+LibOIE_uint32 CServer::AcceptDevice(const std::string & sDeviceName, const std::string & sApplicationName, const std::string & sVersionName)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CServer::UnAcceptDevice(const LibOIE_uint32 nRuleID)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CServer::ClearAcceptedDevices()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+IConnectionIterator * CServer::ListConnections()
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CServer::SetConnectionAcceptedCallback(const LibOIE::ConnectionAcceptedCallback pCallback)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
+void CServer::SetConnectionRejectedCallback(const LibOIE::ConnectionRejectedCallback pCallback)
+{
+	throw ELibOIEInterfaceException(LIBOIE_ERROR_NOTIMPLEMENTED);
+}
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_server.hpp b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_server.hpp
new file mode 100644
index 00000000..dca28438
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Implementation/liboie_server.hpp
@@ -0,0 +1,120 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CServer
+
+*/
+
+
+#ifndef __LIBOIE_SERVER
+#define __LIBOIE_SERVER
+
+#include "liboie_interfaces.hpp"
+
+// Parent classes
+#include "liboie_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+namespace brynet {
+    namespace net {
+        class TcpService;
+
+        namespace wrapper {
+            class ListenerBuilder;
+        }
+
+    }
+}
+#define LIBOIE_THREADCOUNT_MIN 4
+#define LIBOIE_THREADCOUNT_MAX 1024
+#define LIBOIE_THREADCOUNT_DEFAULT 32
+
+#define LIBOIE_RECEIVEBUFFERSIZE_MIN 4096
+#define LIBOIE_RECEIVEBUFFERSIZE_MAX (1024 * 1024 * 1024)
+#define LIBOIE_RECEIVEBUFFERSIZE_DEFAULT (1024 * 1024)
+
+
+namespace LibOIE {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CServer 
+**************************************************************************************************************************/
+
+class CServer : public virtual IServer, public virtual CBase {
+private:
+    uint32_t m_nThreadCount;
+    uint32_t m_nReceiveBufferSize;
+
+    std::shared_ptr<brynet::net::TcpService> m_pService;
+    std::shared_ptr<brynet::net::wrapper::ListenerBuilder> m_pListener;
+
+protected:
+
+
+public:
+
+    CServer();
+
+	void Start(const std::string & sIPAddress, const LibOIE_uint32 nPort, const bool bIPv6) override;
+
+	void Stop() override;
+
+	void CloseAllConnections() override;
+
+	void SetThreadCount(const LibOIE_uint32 nThreadCount) override;
+
+	void SetBufferSize(const LibOIE_uint32 nRCVBufferSize) override;
+
+	LibOIE_uint32 AcceptDevice(const std::string & sDeviceName, const std::string & sApplicationName, const std::string & sVersionName) override;
+
+	void UnAcceptDevice(const LibOIE_uint32 nRuleID) override;
+
+	void ClearAcceptedDevices() override;
+
+	IConnectionIterator * ListConnections() override;
+
+	void SetConnectionAcceptedCallback(const LibOIE::ConnectionAcceptedCallback pCallback) override;
+
+	void SetConnectionRejectedCallback(const LibOIE::ConnectionRejectedCallback pCallback) override;
+
+};
+
+} // namespace Impl
+} // namespace LibOIE
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBOIE_SERVER
diff --git a/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_abi.hpp b/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_abi.hpp
new file mode 100644
index 00000000..6aee6dc5
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_abi.hpp
@@ -0,0 +1,576 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file in order to allow an easy
+ use of ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBOIE_HEADER_CPP
+#define __LIBOIE_HEADER_CPP
+
+#ifdef __LIBOIE_EXPORTS
+#ifdef _WIN32
+#define LIBOIE_DECLSPEC __declspec (dllexport)
+#else // _WIN32
+#define LIBOIE_DECLSPEC __attribute__((visibility("default")))
+#endif // _WIN32
+#else // __LIBOIE_EXPORTS
+#define LIBOIE_DECLSPEC
+#endif // __LIBOIE_EXPORTS
+
+#include "liboie_types.hpp"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*************************************************************************************************************************
+ Class definition for Base
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for Iterator
+**************************************************************************************************************************/
+
+/**
+* Iterates to the next resource in the list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pHasNext - Iterates to the next resource in the list.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_iterator_movenext(LibOIE_Iterator pIterator, bool * pHasNext);
+
+/**
+* Iterates to the previous resource in the list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pHasPrevious - Iterates to the previous resource in the list.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_iterator_moveprevious(LibOIE_Iterator pIterator, bool * pHasPrevious);
+
+/**
+* Returns the resource the iterator points at.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pCurrentInstance - returns the resource instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_iterator_getcurrent(LibOIE_Iterator pIterator, LibOIE_Base * pCurrentInstance);
+
+/**
+* Creates a new resource iterator with the same resource list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pOutIterator - returns the cloned Iterator instance
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_iterator_clone(LibOIE_Iterator pIterator, LibOIE_Iterator * pOutIterator);
+
+/**
+* Returns the number of resoucres the iterator captures.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pCount - returns the number of resources the iterator captures.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_iterator_count(LibOIE_Iterator pIterator, LibOIE_uint64 * pCount);
+
+/*************************************************************************************************************************
+ Class definition for DataPackage
+**************************************************************************************************************************/
+
+/**
+* Returns the raw payload.
+*
+* @param[in] pDataPackage - DataPackage instance.
+* @param[in] nPayloadBufferSize - Number of elements in buffer
+* @param[out] pPayloadNeededCount - will be filled with the count of the written elements, or needed buffer size.
+* @param[out] pPayloadBuffer - uint8 buffer of Raw payload data.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_datapackage_getrawpayload(LibOIE_DataPackage pDataPackage, const LibOIE_uint64 nPayloadBufferSize, LibOIE_uint64* pPayloadNeededCount, LibOIE_uint8 * pPayloadBuffer);
+
+/**
+* Releases memory of the data package.
+*
+* @param[in] pDataPackage - DataPackage instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_datapackage_release(LibOIE_DataPackage pDataPackage);
+
+/*************************************************************************************************************************
+ Class definition for PyroDataPackage
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for PyroDataPackageIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the data package the iterator points at.
+*
+* @param[in] pPyroDataPackageIterator - PyroDataPackageIterator instance.
+* @param[out] pCurrentInstance - returns the data package instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_pyrodatapackageiterator_getcurrentpyrodatapackage(LibOIE_PyroDataPackageIterator pPyroDataPackageIterator, LibOIE_PyroDataPackage * pCurrentInstance);
+
+/*************************************************************************************************************************
+ Class definition for OctDataPackage
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for OctDataPackageIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the data package the iterator points at.
+*
+* @param[in] pOctDataPackageIterator - OctDataPackageIterator instance.
+* @param[out] pCurrentInstance - returns the data package instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_octdatapackageiterator_getcurrentoctdatapackage(LibOIE_OctDataPackageIterator pOctDataPackageIterator, LibOIE_OctDataPackage * pCurrentInstance);
+
+/*************************************************************************************************************************
+ Class definition for RemoteFunctionCall
+**************************************************************************************************************************/
+
+/**
+* Returns function name
+*
+* @param[in] pRemoteFunctionCall - RemoteFunctionCall instance.
+* @param[in] nFunctionNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFunctionNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFunctionNameBuffer -  buffer of Function Name., may be NULL
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_remotefunctioncall_getfunctionname(LibOIE_RemoteFunctionCall pRemoteFunctionCall, const LibOIE_uint32 nFunctionNameBufferSize, LibOIE_uint32* pFunctionNameNeededChars, char * pFunctionNameBuffer);
+
+/**
+* Adds a function call parameter
+*
+* @param[in] pRemoteFunctionCall - RemoteFunctionCall instance.
+* @param[in] pParameter - Parameter of the call.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_remotefunctioncall_addparameter(LibOIE_RemoteFunctionCall pRemoteFunctionCall, const char * pParameter);
+
+/**
+* Sends a remote function call over its connection.
+*
+* @param[in] pRemoteFunctionCall - RemoteFunctionCall instance.
+* @param[in] nResultStringBufferSize - size of the buffer (including trailing 0)
+* @param[out] pResultStringNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pResultStringBuffer -  buffer of Returns result if successful., may be NULL
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_remotefunctioncall_send(LibOIE_RemoteFunctionCall pRemoteFunctionCall, const LibOIE_uint32 nResultStringBufferSize, LibOIE_uint32* pResultStringNeededChars, char * pResultStringBuffer);
+
+/*************************************************************************************************************************
+ Class definition for Connection
+**************************************************************************************************************************/
+
+/**
+* Disconnects and closes the connection
+*
+* @param[in] pConnection - Connection instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_disconnect(LibOIE_Connection pConnection);
+
+/**
+* Sets timeout value for each poll request below.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nTimeout - Timeout in milliseconds. Default is 1000ms. Minimum 10ms, maximum 1000000ms.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_setrequesttimeout(LibOIE_Connection pConnection, LibOIE_uint32 nTimeout);
+
+/**
+* Sets the maximum error messages that can be received before the connection is terminated.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nErrorCount - Max Error count. Default is 1024. Minimum 16, maximum 65535.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_setmaxerrorcount(LibOIE_Connection pConnection, LibOIE_uint32 nErrorCount);
+
+/**
+* Sets the maximum memory buffer the data packets can use before the connection is terminated.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nMaxMemoryCount - Max memory count in bytes. Default is 1MB. Minimum 1kB, maximum 1GB.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_setmaxmemorycount(LibOIE_Connection pConnection, LibOIE_uint32 nMaxMemoryCount);
+
+/**
+* Sets a temporary filename to which the packets are buffered.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFileName - Filename which should be used as buffer.
+* @param[in] nMaxMemoryCount - Max memory count in bytes. Default is 1MB. Minimum 1kB, maximum 1TB.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_setbufferfile(LibOIE_Connection pConnection, const char * pFileName, LibOIE_uint64 nMaxMemoryCount);
+
+/**
+* Stops writing to disk.
+*
+* @param[in] pConnection - Connection instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_unsetbufferfile(LibOIE_Connection pConnection);
+
+/**
+* Sets check alive interval. 0ms means no check alive request is sent.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nCheckAliveInterval - Timeout in milliseconds. Default is 1000ms. Max value is 1000000ms.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_setcheckaliveinterval(LibOIE_Connection pConnection, LibOIE_uint32 nCheckAliveInterval);
+
+/**
+* Retrieves Firmware Version. Fails if firmware is not existing.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFirmwareName - Name of the firmware to retrieve.
+* @param[in] nFirmwareVersionBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFirmwareVersionNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFirmwareVersionBuffer -  buffer of Version of the requested firmware., may be NULL
+* @param[in] nFilenameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFilenameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFilenameBuffer -  buffer of Filename of the requested firmware., may be NULL
+* @param[in] nFiledateBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFiledateNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFiledateBuffer -  buffer of Timestamp of the requested firmware in ISO8601 Time., may be NULL
+* @param[in] nSHA256BufferSize - size of the buffer (including trailing 0)
+* @param[out] pSHA256NeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pSHA256Buffer -  buffer of Checksum of the requested firmware., may be NULL
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_retrievefirmwareversion(LibOIE_Connection pConnection, const char * pFirmwareName, const LibOIE_uint32 nFirmwareVersionBufferSize, LibOIE_uint32* pFirmwareVersionNeededChars, char * pFirmwareVersionBuffer, const LibOIE_uint32 nFilenameBufferSize, LibOIE_uint32* pFilenameNeededChars, char * pFilenameBuffer, const LibOIE_uint32 nFiledateBufferSize, LibOIE_uint32* pFiledateNeededChars, char * pFiledateBuffer, const LibOIE_uint32 nSHA256BufferSize, LibOIE_uint32* pSHA256NeededChars, char * pSHA256Buffer);
+
+/**
+* Retrieves Firmware Version. Fails if firmware is not existing.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFirmwareName - Name of the new firmware.
+* @param[in] pFirmwareVersion - Version of the new firmware.
+* @param[in] pFileName - Filename of the new firmware.
+* @param[in] pFileDate - Timestamp of the requested firmware in ISO8601 Time.
+* @param[in] pSHA256 - Checksum of the new firmware.
+* @param[in] nBinaryDataBufferSize - Number of elements in buffer
+* @param[in] pBinaryDataBuffer - uint8 buffer of Blob of new firmware.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_updatefirmware(LibOIE_Connection pConnection, const char * pFirmwareName, const char * pFirmwareVersion, const char * pFileName, const char * pFileDate, const char * pSHA256, LibOIE_uint64 nBinaryDataBufferSize, const LibOIE_uint8 * pBinaryDataBuffer);
+
+/**
+* Starts firmware on Open Interface Extension.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFileName - Filename of the firmware to start.
+* @param[out] pSuccess - Firmware successfully started.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_startfirmware(LibOIE_Connection pConnection, const char * pFileName, bool * pSuccess);
+
+/**
+* Stops firmware on Open Interface Extension.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFileName - Filename of the firmware to stop.
+* @param[out] pSuccess - Firmware successfully stopped.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_stopfirmware(LibOIE_Connection pConnection, const char * pFileName, bool * pSuccess);
+
+/**
+* sets a callback that triggers when a connection error occured.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pCallback - callback pointer.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_setconnectionerrorcallback(LibOIE_Connection pConnection, LibOIE::ConnectionErrorCallback pCallback);
+
+/**
+* clears the error log.
+*
+* @param[in] pConnection - Connection instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_clearerrors(LibOIE_Connection pConnection);
+
+/**
+* Returns the list of errors in the error log.
+*
+* @param[in] pConnection - Connection instance.
+* @param[out] pErrorCount - Errors in the error log.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_geterrorcount(LibOIE_Connection pConnection, LibOIE_uint32 * pErrorCount);
+
+/**
+* Returns an error message of the error log
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] nErrorIndex - Index of the error.
+* @param[in] nErrorMessageBufferSize - size of the buffer (including trailing 0)
+* @param[out] pErrorMessageNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pErrorMessageBuffer -  buffer of Message of the error., may be NULL
+* @param[in] nTimestampBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTimestampNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTimestampBuffer -  buffer of ISO8601 Time when the error was reported., may be NULL
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_geterror(LibOIE_Connection pConnection, LibOIE_uint32 nErrorIndex, const LibOIE_uint32 nErrorMessageBufferSize, LibOIE_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, const LibOIE_uint32 nTimestampBufferSize, LibOIE_uint32* pTimestampNeededChars, char * pTimestampBuffer);
+
+/**
+* Creates a new remote function call.
+*
+* @param[in] pConnection - Connection instance.
+* @param[in] pFunctionName - Function name.
+* @param[out] pInstance - Function call instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_createremotefunctioncall(LibOIE_Connection pConnection, const char * pFunctionName, LibOIE_RemoteFunctionCall * pInstance);
+
+/**
+* Retrieves currently buffered pyro packages.
+*
+* @param[in] pConnection - Connection instance.
+* @param[out] pIterator - Iterator of buffered packages.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_getbufferedpyropackages(LibOIE_Connection pConnection, LibOIE_PyroDataPackageIterator * pIterator);
+
+/**
+* Retrieves currently buffered oct packages.
+*
+* @param[in] pConnection - Connection instance.
+* @param[out] pIterator - Iterator of buffered packages.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connection_getbufferedoctpackages(LibOIE_Connection pConnection, LibOIE_OctDataPackageIterator * pIterator);
+
+/*************************************************************************************************************************
+ Class definition for ConnectionIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the connection the iterator points at.
+*
+* @param[in] pConnectionIterator - ConnectionIterator instance.
+* @param[out] pCurrentInstance - returns the connection instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_connectioniterator_getcurrentconnection(LibOIE_ConnectionIterator pConnectionIterator, LibOIE_Connection * pCurrentInstance);
+
+/*************************************************************************************************************************
+ Class definition for Server
+**************************************************************************************************************************/
+
+/**
+* starts listening for connections.
+*
+* @param[in] pServer - Server instance.
+* @param[in] pIPAddress - IP Address to run on
+* @param[in] nPort - Port to run on
+* @param[in] bIPv6 - flag if IPv6 should be used
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_start(LibOIE_Server pServer, const char * pIPAddress, LibOIE_uint32 nPort, bool bIPv6);
+
+/**
+* stops listening for connections and disconnects existing ones.
+*
+* @param[in] pServer - Server instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_stop(LibOIE_Server pServer);
+
+/**
+* disconnects all connections but does not stop listening.
+*
+* @param[in] pServer - Server instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_closeallconnections(LibOIE_Server pServer);
+
+/**
+* sets the maximum thread count to use. Must be called before Start
+*
+* @param[in] pServer - Server instance.
+* @param[in] nThreadCount - Thread count to use (must be larger than 4, default is 32)
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_setthreadcount(LibOIE_Server pServer, LibOIE_uint32 nThreadCount);
+
+/**
+* sets the receive buffer size
+*
+* @param[in] pServer - Server instance.
+* @param[in] nRCVBufferSize - Receive buffer size to use in bytes (must be between 4kB and 1GB, default is 1MB)
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_setbuffersize(LibOIE_Server pServer, LibOIE_uint32 nRCVBufferSize);
+
+/**
+* adds an accepted device
+*
+* @param[in] pServer - Server instance.
+* @param[in] pDeviceName - Device name to be accepted. Empty string means all devices.
+* @param[in] pApplicationName - Application name to be accepted. Empty string means all applications.
+* @param[in] pVersionName - Version name to be accepted. Empty string means all versions.
+* @param[out] pRuleID - Returns identifier of acceptance rule.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_acceptdevice(LibOIE_Server pServer, const char * pDeviceName, const char * pApplicationName, const char * pVersionName, LibOIE_uint32 * pRuleID);
+
+/**
+* removes an accepted
+*
+* @param[in] pServer - Server instance.
+* @param[in] nRuleID - identifier of acceptance rule.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_unacceptdevice(LibOIE_Server pServer, LibOIE_uint32 nRuleID);
+
+/**
+* clears all accepted device rules
+*
+* @param[in] pServer - Server instance.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_clearaccepteddevices(LibOIE_Server pServer);
+
+/**
+* lists all open connections
+*
+* @param[in] pServer - Server instance.
+* @param[out] pConnectionIteratorInstance - list of all open connections.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_listconnections(LibOIE_Server pServer, LibOIE_ConnectionIterator * pConnectionIteratorInstance);
+
+/**
+* sets a callback that triggers when a new connection was established.
+*
+* @param[in] pServer - Server instance.
+* @param[in] pCallback - callback pointer.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_setconnectionacceptedcallback(LibOIE_Server pServer, LibOIE::ConnectionAcceptedCallback pCallback);
+
+/**
+* sets a callback that triggers when a new connection was rejected.
+*
+* @param[in] pServer - Server instance.
+* @param[in] pCallback - callback pointer.
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_server_setconnectionrejectedcallback(LibOIE_Server pServer, LibOIE::ConnectionRejectedCallback pCallback);
+
+/*************************************************************************************************************************
+ Global functions
+**************************************************************************************************************************/
+
+/**
+* retrieves the binary version of this library.
+*
+* @param[out] pMajor - returns the major version of this library
+* @param[out] pMinor - returns the minor version of this library
+* @param[out] pMicro - returns the micro version of this library
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_getversion(LibOIE_uint32 * pMajor, LibOIE_uint32 * pMinor, LibOIE_uint32 * pMicro);
+
+/**
+* Returns the last error recorded on this object
+*
+* @param[in] pInstance - Instance Handle
+* @param[in] nErrorMessageBufferSize - size of the buffer (including trailing 0)
+* @param[out] pErrorMessageNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pErrorMessageBuffer -  buffer of Message of the last error, may be NULL
+* @param[out] pHasError - Is there a last error to query
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_getlasterror(LibOIE_Base pInstance, const LibOIE_uint32 nErrorMessageBufferSize, LibOIE_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError);
+
+/**
+* Releases shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_releaseinstance(LibOIE_Base pInstance);
+
+/**
+* Acquires shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_acquireinstance(LibOIE_Base pInstance);
+
+/**
+* Returns the address of the SymbolLookupMethod
+*
+* @param[out] pSymbolLookupMethod - Address of the SymbolAddressMethod
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_getsymbollookupmethod(LibOIE_pvoid * pSymbolLookupMethod);
+
+/**
+* Creates a open interface extension server instance.
+*
+* @param[out] pInstance - New Server instance
+* @return error code or 0 (success)
+*/
+LIBOIE_DECLSPEC LibOIEResult liboie_createserver(LibOIE_Server * pInstance);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __LIBOIE_HEADER_CPP
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_interfaceexception.cpp b/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_interfaceexception.cpp
new file mode 100644
index 00000000..99737786
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_interfaceexception.cpp
@@ -0,0 +1,68 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++ Implementation file with the basic internal
+ exception type in order to allow an easy use of ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+
+#include <string>
+
+#include "liboie_interfaceexception.hpp"
+
+/*************************************************************************************************************************
+ Class ELibOIEInterfaceException
+**************************************************************************************************************************/
+ELibOIEInterfaceException::ELibOIEInterfaceException(LibOIEResult errorCode)
+	: m_errorMessage(LIBOIE_GETERRORSTRING (errorCode))
+{
+	m_errorCode = errorCode;
+}
+
+ELibOIEInterfaceException::ELibOIEInterfaceException(LibOIEResult errorCode, std::string errorMessage)
+	: m_errorMessage(errorMessage + " (" + std::to_string (errorCode) + ")")
+{
+	m_errorCode = errorCode;
+}
+
+LibOIEResult ELibOIEInterfaceException::getErrorCode ()
+{
+	return m_errorCode;
+}
+
+const char * ELibOIEInterfaceException::what () const noexcept
+{
+	return m_errorMessage.c_str();
+}
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_interfaceexception.hpp b/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_interfaceexception.hpp
new file mode 100644
index 00000000..f214c4c8
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_interfaceexception.hpp
@@ -0,0 +1,83 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++ Header file with the basic internal
+ exception type in order to allow an easy use of ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBOIE_INTERFACEEXCEPTION_HEADER
+#define __LIBOIE_INTERFACEEXCEPTION_HEADER
+
+#include <exception>
+#include <stdexcept>
+#include "liboie_types.hpp"
+
+/*************************************************************************************************************************
+ Class ELibOIEInterfaceException
+**************************************************************************************************************************/
+
+
+class ELibOIEInterfaceException : public std::exception {
+protected:
+	/**
+	* Error code for the Exception.
+	*/
+	LibOIEResult m_errorCode;
+	/**
+	* Error message for the Exception.
+	*/
+	std::string m_errorMessage;
+
+public:
+	/**
+	* Exception Constructor.
+	*/
+	ELibOIEInterfaceException(LibOIEResult errorCode);
+
+	/**
+	* Custom Exception Constructor.
+	*/
+	ELibOIEInterfaceException(LibOIEResult errorCode, std::string errorMessage);
+
+	/**
+	* Returns error code
+	*/
+	LibOIEResult getErrorCode();
+	/**
+	* Returns error message
+	*/
+	const char* what() const noexcept override;
+};
+
+#endif // __LIBOIE_INTERFACEEXCEPTION_HEADER
diff --git a/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_interfaces.hpp b/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_interfaces.hpp
new file mode 100644
index 00000000..d9fa5a8a
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_interfaces.hpp
@@ -0,0 +1,693 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++ header file in order to allow easy
+development of ScanLab Open Interface Extension. The implementer of ScanLab Open Interface Extension needs to
+derive concrete classes from the abstract classes in this header.
+
+Interface version: 1.0.0
+
+*/
+
+
+#ifndef __LIBOIE_CPPINTERFACES
+#define __LIBOIE_CPPINTERFACES
+
+#include <string>
+#include <memory>
+
+#include "liboie_types.hpp"
+
+
+
+namespace LibOIE {
+namespace Impl {
+
+/**
+ Forward declarations of class interfaces
+*/
+class IBase;
+class IIterator;
+class IDataPackage;
+class IPyroDataPackage;
+class IPyroDataPackageIterator;
+class IOctDataPackage;
+class IOctDataPackageIterator;
+class IRemoteFunctionCall;
+class IConnection;
+class IConnectionIterator;
+class IServer;
+
+
+
+/*************************************************************************************************************************
+ Parameter Cache definitions
+**************************************************************************************************************************/
+
+class ParameterCache {
+	public:
+		virtual ~ParameterCache() {}
+};
+
+template <class T1> class ParameterCache_1 : public ParameterCache {
+	private:
+		T1 m_param1;
+	public:
+		ParameterCache_1 (const T1 & param1)
+			: m_param1 (param1)
+		{
+		}
+
+		void retrieveData (T1 & param1)
+		{
+			param1 = m_param1;
+		}
+};
+
+template <class T1, class T2> class ParameterCache_2 : public ParameterCache {
+	private:
+		T1 m_param1;
+		T2 m_param2;
+	public:
+		ParameterCache_2 (const T1 & param1, const T2 & param2)
+			: m_param1 (param1), m_param2 (param2)
+		{
+		}
+
+		void retrieveData (T1 & param1, T2 & param2)
+		{
+			param1 = m_param1;
+			param2 = m_param2;
+		}
+};
+
+template <class T1, class T2, class T3> class ParameterCache_3 : public ParameterCache {
+	private:
+		T1 m_param1;
+		T2 m_param2;
+		T3 m_param3;
+	public:
+		ParameterCache_3 (const T1 & param1, const T2 & param2, const T3 & param3)
+			: m_param1 (param1), m_param2 (param2), m_param3 (param3)
+		{
+		}
+
+		void retrieveData (T1 & param1, T2 & param2, T3 & param3)
+		{
+			param1 = m_param1;
+			param2 = m_param2;
+			param3 = m_param3;
+		}
+};
+
+template <class T1, class T2, class T3, class T4> class ParameterCache_4 : public ParameterCache {
+	private:
+		T1 m_param1;
+		T2 m_param2;
+		T3 m_param3;
+		T4 m_param4;
+	public:
+		ParameterCache_4 (const T1 & param1, const T2 & param2, const T3 & param3, const T4 & param4)
+			: m_param1 (param1), m_param2 (param2), m_param3 (param3), m_param4 (param4)
+		{
+		}
+
+		void retrieveData (T1 & param1, T2 & param2, T3 & param3, T4 & param4)
+		{
+			param1 = m_param1;
+			param2 = m_param2;
+			param3 = m_param3;
+			param4 = m_param4;
+		}
+};
+
+
+/*************************************************************************************************************************
+ Class interface for Base 
+**************************************************************************************************************************/
+
+class IBase {
+private:
+	std::unique_ptr<ParameterCache> m_ParameterCache;
+public:
+	/**
+	* IBase::~IBase - virtual destructor of IBase
+	*/
+	virtual ~IBase() {};
+
+	/**
+	* IBase::ReleaseBaseClassInterface - Releases ownership of a base class interface. Deletes the reference, if necessary.
+	* @param[in] pIBase - The base class instance to release
+	*/
+	static void ReleaseBaseClassInterface(IBase* pIBase)
+	{
+		if (pIBase) {
+			pIBase->DecRefCount();
+		}
+	};
+
+	/**
+	* IBase::AcquireBaseClassInterface - Acquires shared ownership of a base class interface.
+	* @param[in] pIBase - The base class instance to acquire
+	*/
+	static void AcquireBaseClassInterface(IBase* pIBase)
+	{
+		if (pIBase) {
+			pIBase->IncRefCount();
+		}
+	};
+
+
+	/**
+	* IBase::GetLastErrorMessage - Returns the last error registered of this class instance
+	* @param[out] sErrorMessage - Message of the last error registered
+	* @return Has an error been registered already
+	*/
+	virtual bool GetLastErrorMessage(std::string & sErrorMessage) = 0;
+
+	/**
+	* IBase::ClearErrorMessages - Clears all registered messages of this class instance
+	*/
+	virtual void ClearErrorMessages() = 0;
+
+	/**
+	* IBase::RegisterErrorMessage - Registers an error message with this class instance
+	* @param[in] sErrorMessage - Error message to register
+	*/
+	virtual void RegisterErrorMessage(const std::string & sErrorMessage) = 0;
+
+	/**
+	* IBase::IncRefCount - Increases the reference count of a class instance
+	*/
+	virtual void IncRefCount() = 0;
+
+	/**
+	* IBase::DecRefCount - Decreases the reference count of a class instance and free releases it, if the last reference has been removed
+	* @return Has the object been released
+	*/
+	virtual bool DecRefCount() = 0;
+
+	/**
+	* IBase::_setCache - set parameter cache of object
+	*/
+	void _setCache(ParameterCache * pCache)
+	{
+		m_ParameterCache.reset(pCache);
+	}
+
+	/**
+	* IBase::_getCache - returns parameter cache of object
+	*/
+	ParameterCache* _getCache()
+	{
+		return m_ParameterCache.get();
+	}
+
+};
+
+
+/**
+ Definition of a shared pointer class for IBase
+*/
+template<class T>
+class IBaseSharedPtr : public std::shared_ptr<T>
+{
+public:
+	explicit IBaseSharedPtr(T* t = nullptr)
+		: std::shared_ptr<T>(t, IBase::ReleaseBaseClassInterface)
+	{
+		t->IncRefCount();
+	}
+
+	// Reset function, as it also needs to properly set the deleter.
+	void reset(T* t = nullptr)
+	{
+		std::shared_ptr<T>::reset(t, IBase::ReleaseBaseClassInterface);
+	}
+
+	// Get-function that increases the Base class's reference count
+	T* getCoOwningPtr()
+	{
+		T* t = this->get();
+		t->IncRefCount();
+		return t;
+	}
+};
+
+
+typedef IBaseSharedPtr<IBase> PIBase;
+
+
+/*************************************************************************************************************************
+ Class interface for Iterator 
+**************************************************************************************************************************/
+
+class IIterator : public virtual IBase {
+public:
+	/**
+	* IIterator::MoveNext - Iterates to the next resource in the list.
+	* @return Iterates to the next resource in the list.
+	*/
+	virtual bool MoveNext() = 0;
+
+	/**
+	* IIterator::MovePrevious - Iterates to the previous resource in the list.
+	* @return Iterates to the previous resource in the list.
+	*/
+	virtual bool MovePrevious() = 0;
+
+	/**
+	* IIterator::GetCurrent - Returns the resource the iterator points at.
+	* @return returns the resource instance.
+	*/
+	virtual IBase * GetCurrent() = 0;
+
+	/**
+	* IIterator::Clone - Creates a new resource iterator with the same resource list.
+	* @return returns the cloned Iterator instance
+	*/
+	virtual IIterator * Clone() = 0;
+
+	/**
+	* IIterator::Count - Returns the number of resoucres the iterator captures.
+	* @return returns the number of resources the iterator captures.
+	*/
+	virtual LibOIE_uint64 Count() = 0;
+
+};
+
+typedef IBaseSharedPtr<IIterator> PIIterator;
+
+
+/*************************************************************************************************************************
+ Class interface for DataPackage 
+**************************************************************************************************************************/
+
+class IDataPackage : public virtual IBase {
+public:
+	/**
+	* IDataPackage::GetRawPayload - Returns the raw payload.
+	* @param[in] nPayloadBufferSize - Number of elements in buffer
+	* @param[out] pPayloadNeededCount - will be filled with the count of the written structs, or needed buffer size.
+	* @param[out] pPayloadBuffer - uint8 buffer of Raw payload data.
+	*/
+	virtual void GetRawPayload(LibOIE_uint64 nPayloadBufferSize, LibOIE_uint64* pPayloadNeededCount, LibOIE_uint8 * pPayloadBuffer) = 0;
+
+	/**
+	* IDataPackage::Release - Releases memory of the data package.
+	*/
+	virtual void Release() = 0;
+
+};
+
+typedef IBaseSharedPtr<IDataPackage> PIDataPackage;
+
+
+/*************************************************************************************************************************
+ Class interface for PyroDataPackage 
+**************************************************************************************************************************/
+
+class IPyroDataPackage : public virtual IDataPackage {
+public:
+};
+
+typedef IBaseSharedPtr<IPyroDataPackage> PIPyroDataPackage;
+
+
+/*************************************************************************************************************************
+ Class interface for PyroDataPackageIterator 
+**************************************************************************************************************************/
+
+class IPyroDataPackageIterator : public virtual IIterator {
+public:
+	/**
+	* IPyroDataPackageIterator::GetCurrentPyroDataPackage - Returns the data package the iterator points at.
+	* @return returns the data package instance.
+	*/
+	virtual IPyroDataPackage * GetCurrentPyroDataPackage() = 0;
+
+};
+
+typedef IBaseSharedPtr<IPyroDataPackageIterator> PIPyroDataPackageIterator;
+
+
+/*************************************************************************************************************************
+ Class interface for OctDataPackage 
+**************************************************************************************************************************/
+
+class IOctDataPackage : public virtual IDataPackage {
+public:
+};
+
+typedef IBaseSharedPtr<IOctDataPackage> PIOctDataPackage;
+
+
+/*************************************************************************************************************************
+ Class interface for OctDataPackageIterator 
+**************************************************************************************************************************/
+
+class IOctDataPackageIterator : public virtual IIterator {
+public:
+	/**
+	* IOctDataPackageIterator::GetCurrentOctDataPackage - Returns the data package the iterator points at.
+	* @return returns the data package instance.
+	*/
+	virtual IOctDataPackage * GetCurrentOctDataPackage() = 0;
+
+};
+
+typedef IBaseSharedPtr<IOctDataPackageIterator> PIOctDataPackageIterator;
+
+
+/*************************************************************************************************************************
+ Class interface for RemoteFunctionCall 
+**************************************************************************************************************************/
+
+class IRemoteFunctionCall : public virtual IBase {
+public:
+	/**
+	* IRemoteFunctionCall::GetFunctionName - Returns function name
+	* @return Function Name.
+	*/
+	virtual std::string GetFunctionName() = 0;
+
+	/**
+	* IRemoteFunctionCall::AddParameter - Adds a function call parameter
+	* @param[in] sParameter - Parameter of the call.
+	*/
+	virtual void AddParameter(const std::string & sParameter) = 0;
+
+	/**
+	* IRemoteFunctionCall::Send - Sends a remote function call over its connection.
+	* @return Returns result if successful.
+	*/
+	virtual std::string Send() = 0;
+
+};
+
+typedef IBaseSharedPtr<IRemoteFunctionCall> PIRemoteFunctionCall;
+
+
+/*************************************************************************************************************************
+ Class interface for Connection 
+**************************************************************************************************************************/
+
+class IConnection : public virtual IBase {
+public:
+	/**
+	* IConnection::Disconnect - Disconnects and closes the connection
+	*/
+	virtual void Disconnect() = 0;
+
+	/**
+	* IConnection::SetRequestTimeout - Sets timeout value for each poll request below.
+	* @param[in] nTimeout - Timeout in milliseconds. Default is 1000ms. Minimum 10ms, maximum 1000000ms.
+	*/
+	virtual void SetRequestTimeout(const LibOIE_uint32 nTimeout) = 0;
+
+	/**
+	* IConnection::SetMaxErrorCount - Sets the maximum error messages that can be received before the connection is terminated.
+	* @param[in] nErrorCount - Max Error count. Default is 1024. Minimum 16, maximum 65535.
+	*/
+	virtual void SetMaxErrorCount(const LibOIE_uint32 nErrorCount) = 0;
+
+	/**
+	* IConnection::SetMaxMemoryCount - Sets the maximum memory buffer the data packets can use before the connection is terminated.
+	* @param[in] nMaxMemoryCount - Max memory count in bytes. Default is 1MB. Minimum 1kB, maximum 1GB.
+	*/
+	virtual void SetMaxMemoryCount(const LibOIE_uint32 nMaxMemoryCount) = 0;
+
+	/**
+	* IConnection::SetBufferFile - Sets a temporary filename to which the packets are buffered.
+	* @param[in] sFileName - Filename which should be used as buffer.
+	* @param[in] nMaxMemoryCount - Max memory count in bytes. Default is 1MB. Minimum 1kB, maximum 1TB.
+	*/
+	virtual void SetBufferFile(const std::string & sFileName, const LibOIE_uint64 nMaxMemoryCount) = 0;
+
+	/**
+	* IConnection::UnsetBufferFile - Stops writing to disk.
+	*/
+	virtual void UnsetBufferFile() = 0;
+
+	/**
+	* IConnection::SetCheckAliveInterval - Sets check alive interval. 0ms means no check alive request is sent.
+	* @param[in] nCheckAliveInterval - Timeout in milliseconds. Default is 1000ms. Max value is 1000000ms.
+	*/
+	virtual void SetCheckAliveInterval(const LibOIE_uint32 nCheckAliveInterval) = 0;
+
+	/**
+	* IConnection::RetrieveFirmwareVersion - Retrieves Firmware Version. Fails if firmware is not existing.
+	* @param[in] sFirmwareName - Name of the firmware to retrieve.
+	* @param[out] sFirmwareVersion - Version of the requested firmware.
+	* @param[out] sFilename - Filename of the requested firmware.
+	* @param[out] sFiledate - Timestamp of the requested firmware in ISO8601 Time.
+	* @param[out] sSHA256 - Checksum of the requested firmware.
+	*/
+	virtual void RetrieveFirmwareVersion(const std::string & sFirmwareName, std::string & sFirmwareVersion, std::string & sFilename, std::string & sFiledate, std::string & sSHA256) = 0;
+
+	/**
+	* IConnection::UpdateFirmware - Retrieves Firmware Version. Fails if firmware is not existing.
+	* @param[in] sFirmwareName - Name of the new firmware.
+	* @param[in] sFirmwareVersion - Version of the new firmware.
+	* @param[in] sFileName - Filename of the new firmware.
+	* @param[in] sFileDate - Timestamp of the requested firmware in ISO8601 Time.
+	* @param[in] sSHA256 - Checksum of the new firmware.
+	* @param[in] nBinaryDataBufferSize - Number of elements in buffer
+	* @param[in] pBinaryDataBuffer - Blob of new firmware.
+	*/
+	virtual void UpdateFirmware(const std::string & sFirmwareName, const std::string & sFirmwareVersion, const std::string & sFileName, const std::string & sFileDate, const std::string & sSHA256, const LibOIE_uint64 nBinaryDataBufferSize, const LibOIE_uint8 * pBinaryDataBuffer) = 0;
+
+	/**
+	* IConnection::StartFirmware - Starts firmware on Open Interface Extension.
+	* @param[in] sFileName - Filename of the firmware to start.
+	* @return Firmware successfully started.
+	*/
+	virtual bool StartFirmware(const std::string & sFileName) = 0;
+
+	/**
+	* IConnection::StopFirmware - Stops firmware on Open Interface Extension.
+	* @param[in] sFileName - Filename of the firmware to stop.
+	* @return Firmware successfully stopped.
+	*/
+	virtual bool StopFirmware(const std::string & sFileName) = 0;
+
+	/**
+	* IConnection::SetConnectionErrorCallback - sets a callback that triggers when a connection error occured.
+	* @param[in] pCallback - callback function
+	*/
+	virtual void SetConnectionErrorCallback(const LibOIE::ConnectionErrorCallback pCallback) = 0;
+
+	/**
+	* IConnection::ClearErrors - clears the error log.
+	*/
+	virtual void ClearErrors() = 0;
+
+	/**
+	* IConnection::GetErrorCount - Returns the list of errors in the error log.
+	* @return Errors in the error log.
+	*/
+	virtual LibOIE_uint32 GetErrorCount() = 0;
+
+	/**
+	* IConnection::GetError - Returns an error message of the error log
+	* @param[in] nErrorIndex - Index of the error.
+	* @param[out] sErrorMessage - Message of the error.
+	* @param[out] sTimestamp - ISO8601 Time when the error was reported.
+	*/
+	virtual void GetError(const LibOIE_uint32 nErrorIndex, std::string & sErrorMessage, std::string & sTimestamp) = 0;
+
+	/**
+	* IConnection::CreateRemoteFunctionCall - Creates a new remote function call.
+	* @param[in] sFunctionName - Function name.
+	* @return Function call instance.
+	*/
+	virtual IRemoteFunctionCall * CreateRemoteFunctionCall(const std::string & sFunctionName) = 0;
+
+	/**
+	* IConnection::GetBufferedPyroPackages - Retrieves currently buffered pyro packages.
+	* @return Iterator of buffered packages.
+	*/
+	virtual IPyroDataPackageIterator * GetBufferedPyroPackages() = 0;
+
+	/**
+	* IConnection::GetBufferedOctPackages - Retrieves currently buffered oct packages.
+	* @return Iterator of buffered packages.
+	*/
+	virtual IOctDataPackageIterator * GetBufferedOctPackages() = 0;
+
+};
+
+typedef IBaseSharedPtr<IConnection> PIConnection;
+
+
+/*************************************************************************************************************************
+ Class interface for ConnectionIterator 
+**************************************************************************************************************************/
+
+class IConnectionIterator : public virtual IIterator {
+public:
+	/**
+	* IConnectionIterator::GetCurrentConnection - Returns the connection the iterator points at.
+	* @return returns the connection instance.
+	*/
+	virtual IConnection * GetCurrentConnection() = 0;
+
+};
+
+typedef IBaseSharedPtr<IConnectionIterator> PIConnectionIterator;
+
+
+/*************************************************************************************************************************
+ Class interface for Server 
+**************************************************************************************************************************/
+
+class IServer : public virtual IBase {
+public:
+	/**
+	* IServer::Start - starts listening for connections.
+	* @param[in] sIPAddress - IP Address to run on
+	* @param[in] nPort - Port to run on
+	* @param[in] bIPv6 - flag if IPv6 should be used
+	*/
+	virtual void Start(const std::string & sIPAddress, const LibOIE_uint32 nPort, const bool bIPv6) = 0;
+
+	/**
+	* IServer::Stop - stops listening for connections and disconnects existing ones.
+	*/
+	virtual void Stop() = 0;
+
+	/**
+	* IServer::CloseAllConnections - disconnects all connections but does not stop listening.
+	*/
+	virtual void CloseAllConnections() = 0;
+
+	/**
+	* IServer::SetThreadCount - sets the maximum thread count to use. Must be called before Start
+	* @param[in] nThreadCount - Thread count to use (must be larger than 4, default is 32)
+	*/
+	virtual void SetThreadCount(const LibOIE_uint32 nThreadCount) = 0;
+
+	/**
+	* IServer::SetBufferSize - sets the receive buffer size
+	* @param[in] nRCVBufferSize - Receive buffer size to use in bytes (must be between 4kB and 1GB, default is 1MB)
+	*/
+	virtual void SetBufferSize(const LibOIE_uint32 nRCVBufferSize) = 0;
+
+	/**
+	* IServer::AcceptDevice - adds an accepted device
+	* @param[in] sDeviceName - Device name to be accepted. Empty string means all devices.
+	* @param[in] sApplicationName - Application name to be accepted. Empty string means all applications.
+	* @param[in] sVersionName - Version name to be accepted. Empty string means all versions.
+	* @return Returns identifier of acceptance rule.
+	*/
+	virtual LibOIE_uint32 AcceptDevice(const std::string & sDeviceName, const std::string & sApplicationName, const std::string & sVersionName) = 0;
+
+	/**
+	* IServer::UnAcceptDevice - removes an accepted
+	* @param[in] nRuleID - identifier of acceptance rule.
+	*/
+	virtual void UnAcceptDevice(const LibOIE_uint32 nRuleID) = 0;
+
+	/**
+	* IServer::ClearAcceptedDevices - clears all accepted device rules
+	*/
+	virtual void ClearAcceptedDevices() = 0;
+
+	/**
+	* IServer::ListConnections - lists all open connections
+	* @return list of all open connections.
+	*/
+	virtual IConnectionIterator * ListConnections() = 0;
+
+	/**
+	* IServer::SetConnectionAcceptedCallback - sets a callback that triggers when a new connection was established.
+	* @param[in] pCallback - callback function
+	*/
+	virtual void SetConnectionAcceptedCallback(const LibOIE::ConnectionAcceptedCallback pCallback) = 0;
+
+	/**
+	* IServer::SetConnectionRejectedCallback - sets a callback that triggers when a new connection was rejected.
+	* @param[in] pCallback - callback function
+	*/
+	virtual void SetConnectionRejectedCallback(const LibOIE::ConnectionRejectedCallback pCallback) = 0;
+
+};
+
+typedef IBaseSharedPtr<IServer> PIServer;
+
+
+/*************************************************************************************************************************
+ Global functions declarations
+**************************************************************************************************************************/
+class CWrapper {
+public:
+	/**
+	* Iliboie::GetVersion - retrieves the binary version of this library.
+	* @param[out] nMajor - returns the major version of this library
+	* @param[out] nMinor - returns the minor version of this library
+	* @param[out] nMicro - returns the micro version of this library
+	*/
+	static void GetVersion(LibOIE_uint32 & nMajor, LibOIE_uint32 & nMinor, LibOIE_uint32 & nMicro);
+
+	/**
+	* Iliboie::GetLastError - Returns the last error recorded on this object
+	* @param[in] pInstance - Instance Handle
+	* @param[out] sErrorMessage - Message of the last error
+	* @return Is there a last error to query
+	*/
+	static bool GetLastError(IBase* pInstance, std::string & sErrorMessage);
+
+	/**
+	* Iliboie::ReleaseInstance - Releases shared ownership of an Instance
+	* @param[in] pInstance - Instance Handle
+	*/
+	static void ReleaseInstance(IBase* pInstance);
+
+	/**
+	* Iliboie::AcquireInstance - Acquires shared ownership of an Instance
+	* @param[in] pInstance - Instance Handle
+	*/
+	static void AcquireInstance(IBase* pInstance);
+
+	/**
+	* Iliboie::CreateServer - Creates a open interface extension server instance.
+	* @return New Server instance
+	*/
+	static IServer * CreateServer();
+
+};
+
+LibOIEResult LibOIE_GetProcAddress (const char * pProcName, void ** ppProcAddress);
+
+} // namespace Impl
+} // namespace LibOIE
+
+#endif // __LIBOIE_CPPINTERFACES
diff --git a/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_interfacewrapper.cpp b/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_interfacewrapper.cpp
new file mode 100644
index 00000000..7b0f048f
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_interfacewrapper.cpp
@@ -0,0 +1,1653 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++ implementation file in order to allow easy
+development of ScanLab Open Interface Extension. The functions in this file need to be implemented. It needs to be generated only once.
+
+Interface version: 1.0.0
+
+*/
+
+#include "liboie_abi.hpp"
+#include "liboie_interfaces.hpp"
+#include "liboie_interfaceexception.hpp"
+
+#include <map>
+
+using namespace LibOIE::Impl;
+
+LibOIEResult handleLibOIEException(IBase * pIBaseClass, ELibOIEInterfaceException & Exception)
+{
+	LibOIEResult errorCode = Exception.getErrorCode();
+
+	if (pIBaseClass != nullptr)
+		pIBaseClass->RegisterErrorMessage(Exception.what());
+
+	return errorCode;
+}
+
+LibOIEResult handleStdException(IBase * pIBaseClass, std::exception & Exception)
+{
+	LibOIEResult errorCode = LIBOIE_ERROR_GENERICEXCEPTION;
+
+	if (pIBaseClass != nullptr)
+		pIBaseClass->RegisterErrorMessage(Exception.what());
+
+	return errorCode;
+}
+
+LibOIEResult handleUnhandledException(IBase * pIBaseClass)
+{
+	LibOIEResult errorCode = LIBOIE_ERROR_GENERICEXCEPTION;
+
+	if (pIBaseClass != nullptr)
+		pIBaseClass->RegisterErrorMessage("Unhandled Exception");
+
+	return errorCode;
+}
+
+
+
+/*************************************************************************************************************************
+ Class implementation for Base
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class implementation for Iterator
+**************************************************************************************************************************/
+LibOIEResult liboie_iterator_movenext(LibOIE_Iterator pIterator, bool * pHasNext)
+{
+	IBase* pIBaseClass = (IBase *)pIterator;
+
+	try {
+		if (pHasNext == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IIterator* pIIterator = dynamic_cast<IIterator*>(pIBaseClass);
+		if (!pIIterator)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		*pHasNext = pIIterator->MoveNext();
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_iterator_moveprevious(LibOIE_Iterator pIterator, bool * pHasPrevious)
+{
+	IBase* pIBaseClass = (IBase *)pIterator;
+
+	try {
+		if (pHasPrevious == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IIterator* pIIterator = dynamic_cast<IIterator*>(pIBaseClass);
+		if (!pIIterator)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		*pHasPrevious = pIIterator->MovePrevious();
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_iterator_getcurrent(LibOIE_Iterator pIterator, LibOIE_Base * pCurrentInstance)
+{
+	IBase* pIBaseClass = (IBase *)pIterator;
+
+	try {
+		if (pCurrentInstance == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IBase* pBaseCurrentInstance(nullptr);
+		IIterator* pIIterator = dynamic_cast<IIterator*>(pIBaseClass);
+		if (!pIIterator)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pBaseCurrentInstance = pIIterator->GetCurrent();
+
+		*pCurrentInstance = (IBase*)(pBaseCurrentInstance);
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_iterator_clone(LibOIE_Iterator pIterator, LibOIE_Iterator * pOutIterator)
+{
+	IBase* pIBaseClass = (IBase *)pIterator;
+
+	try {
+		if (pOutIterator == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IBase* pBaseOutIterator(nullptr);
+		IIterator* pIIterator = dynamic_cast<IIterator*>(pIBaseClass);
+		if (!pIIterator)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pBaseOutIterator = pIIterator->Clone();
+
+		*pOutIterator = (IBase*)(pBaseOutIterator);
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_iterator_count(LibOIE_Iterator pIterator, LibOIE_uint64 * pCount)
+{
+	IBase* pIBaseClass = (IBase *)pIterator;
+
+	try {
+		if (pCount == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IIterator* pIIterator = dynamic_cast<IIterator*>(pIBaseClass);
+		if (!pIIterator)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		*pCount = pIIterator->Count();
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for DataPackage
+**************************************************************************************************************************/
+LibOIEResult liboie_datapackage_getrawpayload(LibOIE_DataPackage pDataPackage, const LibOIE_uint64 nPayloadBufferSize, LibOIE_uint64* pPayloadNeededCount, LibOIE_uint8 * pPayloadBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pDataPackage;
+
+	try {
+		if ((!pPayloadBuffer) && !(pPayloadNeededCount))
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IDataPackage* pIDataPackage = dynamic_cast<IDataPackage*>(pIBaseClass);
+		if (!pIDataPackage)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIDataPackage->GetRawPayload(nPayloadBufferSize, pPayloadNeededCount, pPayloadBuffer);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_datapackage_release(LibOIE_DataPackage pDataPackage)
+{
+	IBase* pIBaseClass = (IBase *)pDataPackage;
+
+	try {
+		IDataPackage* pIDataPackage = dynamic_cast<IDataPackage*>(pIBaseClass);
+		if (!pIDataPackage)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIDataPackage->Release();
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for PyroDataPackage
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class implementation for PyroDataPackageIterator
+**************************************************************************************************************************/
+LibOIEResult liboie_pyrodatapackageiterator_getcurrentpyrodatapackage(LibOIE_PyroDataPackageIterator pPyroDataPackageIterator, LibOIE_PyroDataPackage * pCurrentInstance)
+{
+	IBase* pIBaseClass = (IBase *)pPyroDataPackageIterator;
+
+	try {
+		if (pCurrentInstance == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IBase* pBaseCurrentInstance(nullptr);
+		IPyroDataPackageIterator* pIPyroDataPackageIterator = dynamic_cast<IPyroDataPackageIterator*>(pIBaseClass);
+		if (!pIPyroDataPackageIterator)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pBaseCurrentInstance = pIPyroDataPackageIterator->GetCurrentPyroDataPackage();
+
+		*pCurrentInstance = (IBase*)(pBaseCurrentInstance);
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for OctDataPackage
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class implementation for OctDataPackageIterator
+**************************************************************************************************************************/
+LibOIEResult liboie_octdatapackageiterator_getcurrentoctdatapackage(LibOIE_OctDataPackageIterator pOctDataPackageIterator, LibOIE_OctDataPackage * pCurrentInstance)
+{
+	IBase* pIBaseClass = (IBase *)pOctDataPackageIterator;
+
+	try {
+		if (pCurrentInstance == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IBase* pBaseCurrentInstance(nullptr);
+		IOctDataPackageIterator* pIOctDataPackageIterator = dynamic_cast<IOctDataPackageIterator*>(pIBaseClass);
+		if (!pIOctDataPackageIterator)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pBaseCurrentInstance = pIOctDataPackageIterator->GetCurrentOctDataPackage();
+
+		*pCurrentInstance = (IBase*)(pBaseCurrentInstance);
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for RemoteFunctionCall
+**************************************************************************************************************************/
+LibOIEResult liboie_remotefunctioncall_getfunctionname(LibOIE_RemoteFunctionCall pRemoteFunctionCall, const LibOIE_uint32 nFunctionNameBufferSize, LibOIE_uint32* pFunctionNameNeededChars, char * pFunctionNameBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pRemoteFunctionCall;
+
+	try {
+		if ( (!pFunctionNameBuffer) && !(pFunctionNameNeededChars) )
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		std::string sFunctionName("");
+		IRemoteFunctionCall* pIRemoteFunctionCall = dynamic_cast<IRemoteFunctionCall*>(pIBaseClass);
+		if (!pIRemoteFunctionCall)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pFunctionNameBuffer == nullptr);
+		if (isCacheCall) {
+			sFunctionName = pIRemoteFunctionCall->GetFunctionName();
+
+			pIRemoteFunctionCall->_setCache (new ParameterCache_1<std::string> (sFunctionName));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIRemoteFunctionCall->_getCache ());
+			if (cache == nullptr)
+				throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+			cache->retrieveData (sFunctionName);
+			pIRemoteFunctionCall->_setCache (nullptr);
+		}
+		
+		if (pFunctionNameNeededChars)
+			*pFunctionNameNeededChars = (LibOIE_uint32) (sFunctionName.size()+1);
+		if (pFunctionNameBuffer) {
+			if (sFunctionName.size() >= nFunctionNameBufferSize)
+				throw ELibOIEInterfaceException (LIBOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iFunctionName = 0; iFunctionName < sFunctionName.size(); iFunctionName++)
+				pFunctionNameBuffer[iFunctionName] = sFunctionName[iFunctionName];
+			pFunctionNameBuffer[sFunctionName.size()] = 0;
+		}
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_remotefunctioncall_addparameter(LibOIE_RemoteFunctionCall pRemoteFunctionCall, const char * pParameter)
+{
+	IBase* pIBaseClass = (IBase *)pRemoteFunctionCall;
+
+	try {
+		if (pParameter == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		std::string sParameter(pParameter);
+		IRemoteFunctionCall* pIRemoteFunctionCall = dynamic_cast<IRemoteFunctionCall*>(pIBaseClass);
+		if (!pIRemoteFunctionCall)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIRemoteFunctionCall->AddParameter(sParameter);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_remotefunctioncall_send(LibOIE_RemoteFunctionCall pRemoteFunctionCall, const LibOIE_uint32 nResultStringBufferSize, LibOIE_uint32* pResultStringNeededChars, char * pResultStringBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pRemoteFunctionCall;
+
+	try {
+		if ( (!pResultStringBuffer) && !(pResultStringNeededChars) )
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		std::string sResultString("");
+		IRemoteFunctionCall* pIRemoteFunctionCall = dynamic_cast<IRemoteFunctionCall*>(pIBaseClass);
+		if (!pIRemoteFunctionCall)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pResultStringBuffer == nullptr);
+		if (isCacheCall) {
+			sResultString = pIRemoteFunctionCall->Send();
+
+			pIRemoteFunctionCall->_setCache (new ParameterCache_1<std::string> (sResultString));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIRemoteFunctionCall->_getCache ());
+			if (cache == nullptr)
+				throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+			cache->retrieveData (sResultString);
+			pIRemoteFunctionCall->_setCache (nullptr);
+		}
+		
+		if (pResultStringNeededChars)
+			*pResultStringNeededChars = (LibOIE_uint32) (sResultString.size()+1);
+		if (pResultStringBuffer) {
+			if (sResultString.size() >= nResultStringBufferSize)
+				throw ELibOIEInterfaceException (LIBOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iResultString = 0; iResultString < sResultString.size(); iResultString++)
+				pResultStringBuffer[iResultString] = sResultString[iResultString];
+			pResultStringBuffer[sResultString.size()] = 0;
+		}
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for Connection
+**************************************************************************************************************************/
+LibOIEResult liboie_connection_disconnect(LibOIE_Connection pConnection)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIConnection->Disconnect();
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_setrequesttimeout(LibOIE_Connection pConnection, LibOIE_uint32 nTimeout)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIConnection->SetRequestTimeout(nTimeout);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_setmaxerrorcount(LibOIE_Connection pConnection, LibOIE_uint32 nErrorCount)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIConnection->SetMaxErrorCount(nErrorCount);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_setmaxmemorycount(LibOIE_Connection pConnection, LibOIE_uint32 nMaxMemoryCount)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIConnection->SetMaxMemoryCount(nMaxMemoryCount);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_setbufferfile(LibOIE_Connection pConnection, const char * pFileName, LibOIE_uint64 nMaxMemoryCount)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		if (pFileName == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		std::string sFileName(pFileName);
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIConnection->SetBufferFile(sFileName, nMaxMemoryCount);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_unsetbufferfile(LibOIE_Connection pConnection)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIConnection->UnsetBufferFile();
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_setcheckaliveinterval(LibOIE_Connection pConnection, LibOIE_uint32 nCheckAliveInterval)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIConnection->SetCheckAliveInterval(nCheckAliveInterval);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_retrievefirmwareversion(LibOIE_Connection pConnection, const char * pFirmwareName, const LibOIE_uint32 nFirmwareVersionBufferSize, LibOIE_uint32* pFirmwareVersionNeededChars, char * pFirmwareVersionBuffer, const LibOIE_uint32 nFilenameBufferSize, LibOIE_uint32* pFilenameNeededChars, char * pFilenameBuffer, const LibOIE_uint32 nFiledateBufferSize, LibOIE_uint32* pFiledateNeededChars, char * pFiledateBuffer, const LibOIE_uint32 nSHA256BufferSize, LibOIE_uint32* pSHA256NeededChars, char * pSHA256Buffer)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		if (pFirmwareName == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if ( (!pFirmwareVersionBuffer) && !(pFirmwareVersionNeededChars) )
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if ( (!pFilenameBuffer) && !(pFilenameNeededChars) )
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if ( (!pFiledateBuffer) && !(pFiledateNeededChars) )
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if ( (!pSHA256Buffer) && !(pSHA256NeededChars) )
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		std::string sFirmwareName(pFirmwareName);
+		std::string sFirmwareVersion("");
+		std::string sFilename("");
+		std::string sFiledate("");
+		std::string sSHA256("");
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pFirmwareVersionBuffer == nullptr) || (pFilenameBuffer == nullptr) || (pFiledateBuffer == nullptr) || (pSHA256Buffer == nullptr);
+		if (isCacheCall) {
+			pIConnection->RetrieveFirmwareVersion(sFirmwareName, sFirmwareVersion, sFilename, sFiledate, sSHA256);
+
+			pIConnection->_setCache (new ParameterCache_4<std::string, std::string, std::string, std::string> (sFirmwareVersion, sFilename, sFiledate, sSHA256));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_4<std::string, std::string, std::string, std::string>*> (pIConnection->_getCache ());
+			if (cache == nullptr)
+				throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+			cache->retrieveData (sFirmwareVersion, sFilename, sFiledate, sSHA256);
+			pIConnection->_setCache (nullptr);
+		}
+		
+		if (pFirmwareVersionNeededChars)
+			*pFirmwareVersionNeededChars = (LibOIE_uint32) (sFirmwareVersion.size()+1);
+		if (pFirmwareVersionBuffer) {
+			if (sFirmwareVersion.size() >= nFirmwareVersionBufferSize)
+				throw ELibOIEInterfaceException (LIBOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iFirmwareVersion = 0; iFirmwareVersion < sFirmwareVersion.size(); iFirmwareVersion++)
+				pFirmwareVersionBuffer[iFirmwareVersion] = sFirmwareVersion[iFirmwareVersion];
+			pFirmwareVersionBuffer[sFirmwareVersion.size()] = 0;
+		}
+		if (pFilenameNeededChars)
+			*pFilenameNeededChars = (LibOIE_uint32) (sFilename.size()+1);
+		if (pFilenameBuffer) {
+			if (sFilename.size() >= nFilenameBufferSize)
+				throw ELibOIEInterfaceException (LIBOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iFilename = 0; iFilename < sFilename.size(); iFilename++)
+				pFilenameBuffer[iFilename] = sFilename[iFilename];
+			pFilenameBuffer[sFilename.size()] = 0;
+		}
+		if (pFiledateNeededChars)
+			*pFiledateNeededChars = (LibOIE_uint32) (sFiledate.size()+1);
+		if (pFiledateBuffer) {
+			if (sFiledate.size() >= nFiledateBufferSize)
+				throw ELibOIEInterfaceException (LIBOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iFiledate = 0; iFiledate < sFiledate.size(); iFiledate++)
+				pFiledateBuffer[iFiledate] = sFiledate[iFiledate];
+			pFiledateBuffer[sFiledate.size()] = 0;
+		}
+		if (pSHA256NeededChars)
+			*pSHA256NeededChars = (LibOIE_uint32) (sSHA256.size()+1);
+		if (pSHA256Buffer) {
+			if (sSHA256.size() >= nSHA256BufferSize)
+				throw ELibOIEInterfaceException (LIBOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iSHA256 = 0; iSHA256 < sSHA256.size(); iSHA256++)
+				pSHA256Buffer[iSHA256] = sSHA256[iSHA256];
+			pSHA256Buffer[sSHA256.size()] = 0;
+		}
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_updatefirmware(LibOIE_Connection pConnection, const char * pFirmwareName, const char * pFirmwareVersion, const char * pFileName, const char * pFileDate, const char * pSHA256, LibOIE_uint64 nBinaryDataBufferSize, const LibOIE_uint8 * pBinaryDataBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		if (pFirmwareName == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if (pFirmwareVersion == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if (pFileName == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if (pFileDate == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if (pSHA256 == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if ( (!pBinaryDataBuffer) && (nBinaryDataBufferSize>0))
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		std::string sFirmwareName(pFirmwareName);
+		std::string sFirmwareVersion(pFirmwareVersion);
+		std::string sFileName(pFileName);
+		std::string sFileDate(pFileDate);
+		std::string sSHA256(pSHA256);
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIConnection->UpdateFirmware(sFirmwareName, sFirmwareVersion, sFileName, sFileDate, sSHA256, nBinaryDataBufferSize, pBinaryDataBuffer);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_startfirmware(LibOIE_Connection pConnection, const char * pFileName, bool * pSuccess)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		if (pFileName == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if (pSuccess == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		std::string sFileName(pFileName);
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		*pSuccess = pIConnection->StartFirmware(sFileName);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_stopfirmware(LibOIE_Connection pConnection, const char * pFileName, bool * pSuccess)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		if (pFileName == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if (pSuccess == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		std::string sFileName(pFileName);
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		*pSuccess = pIConnection->StopFirmware(sFileName);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_setconnectionerrorcallback(LibOIE_Connection pConnection, LibOIEConnectionErrorCallback pCallback)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIConnection->SetConnectionErrorCallback(pCallback);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_clearerrors(LibOIE_Connection pConnection)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIConnection->ClearErrors();
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_geterrorcount(LibOIE_Connection pConnection, LibOIE_uint32 * pErrorCount)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		if (pErrorCount == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		*pErrorCount = pIConnection->GetErrorCount();
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_geterror(LibOIE_Connection pConnection, LibOIE_uint32 nErrorIndex, const LibOIE_uint32 nErrorMessageBufferSize, LibOIE_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, const LibOIE_uint32 nTimestampBufferSize, LibOIE_uint32* pTimestampNeededChars, char * pTimestampBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		if ( (!pErrorMessageBuffer) && !(pErrorMessageNeededChars) )
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if ( (!pTimestampBuffer) && !(pTimestampNeededChars) )
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		std::string sErrorMessage("");
+		std::string sTimestamp("");
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pErrorMessageBuffer == nullptr) || (pTimestampBuffer == nullptr);
+		if (isCacheCall) {
+			pIConnection->GetError(nErrorIndex, sErrorMessage, sTimestamp);
+
+			pIConnection->_setCache (new ParameterCache_2<std::string, std::string> (sErrorMessage, sTimestamp));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_2<std::string, std::string>*> (pIConnection->_getCache ());
+			if (cache == nullptr)
+				throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+			cache->retrieveData (sErrorMessage, sTimestamp);
+			pIConnection->_setCache (nullptr);
+		}
+		
+		if (pErrorMessageNeededChars)
+			*pErrorMessageNeededChars = (LibOIE_uint32) (sErrorMessage.size()+1);
+		if (pErrorMessageBuffer) {
+			if (sErrorMessage.size() >= nErrorMessageBufferSize)
+				throw ELibOIEInterfaceException (LIBOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iErrorMessage = 0; iErrorMessage < sErrorMessage.size(); iErrorMessage++)
+				pErrorMessageBuffer[iErrorMessage] = sErrorMessage[iErrorMessage];
+			pErrorMessageBuffer[sErrorMessage.size()] = 0;
+		}
+		if (pTimestampNeededChars)
+			*pTimestampNeededChars = (LibOIE_uint32) (sTimestamp.size()+1);
+		if (pTimestampBuffer) {
+			if (sTimestamp.size() >= nTimestampBufferSize)
+				throw ELibOIEInterfaceException (LIBOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iTimestamp = 0; iTimestamp < sTimestamp.size(); iTimestamp++)
+				pTimestampBuffer[iTimestamp] = sTimestamp[iTimestamp];
+			pTimestampBuffer[sTimestamp.size()] = 0;
+		}
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_createremotefunctioncall(LibOIE_Connection pConnection, const char * pFunctionName, LibOIE_RemoteFunctionCall * pInstance)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		if (pFunctionName == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if (pInstance == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		std::string sFunctionName(pFunctionName);
+		IBase* pBaseInstance(nullptr);
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pBaseInstance = pIConnection->CreateRemoteFunctionCall(sFunctionName);
+
+		*pInstance = (IBase*)(pBaseInstance);
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_getbufferedpyropackages(LibOIE_Connection pConnection, LibOIE_PyroDataPackageIterator * pIterator)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		if (pIterator == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IBase* pBaseIterator(nullptr);
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pBaseIterator = pIConnection->GetBufferedPyroPackages();
+
+		*pIterator = (IBase*)(pBaseIterator);
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_connection_getbufferedoctpackages(LibOIE_Connection pConnection, LibOIE_OctDataPackageIterator * pIterator)
+{
+	IBase* pIBaseClass = (IBase *)pConnection;
+
+	try {
+		if (pIterator == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IBase* pBaseIterator(nullptr);
+		IConnection* pIConnection = dynamic_cast<IConnection*>(pIBaseClass);
+		if (!pIConnection)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pBaseIterator = pIConnection->GetBufferedOctPackages();
+
+		*pIterator = (IBase*)(pBaseIterator);
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for ConnectionIterator
+**************************************************************************************************************************/
+LibOIEResult liboie_connectioniterator_getcurrentconnection(LibOIE_ConnectionIterator pConnectionIterator, LibOIE_Connection * pCurrentInstance)
+{
+	IBase* pIBaseClass = (IBase *)pConnectionIterator;
+
+	try {
+		if (pCurrentInstance == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IBase* pBaseCurrentInstance(nullptr);
+		IConnectionIterator* pIConnectionIterator = dynamic_cast<IConnectionIterator*>(pIBaseClass);
+		if (!pIConnectionIterator)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pBaseCurrentInstance = pIConnectionIterator->GetCurrentConnection();
+
+		*pCurrentInstance = (IBase*)(pBaseCurrentInstance);
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for Server
+**************************************************************************************************************************/
+LibOIEResult liboie_server_start(LibOIE_Server pServer, const char * pIPAddress, LibOIE_uint32 nPort, bool bIPv6)
+{
+	IBase* pIBaseClass = (IBase *)pServer;
+
+	try {
+		if (pIPAddress == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		std::string sIPAddress(pIPAddress);
+		IServer* pIServer = dynamic_cast<IServer*>(pIBaseClass);
+		if (!pIServer)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIServer->Start(sIPAddress, nPort, bIPv6);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_server_stop(LibOIE_Server pServer)
+{
+	IBase* pIBaseClass = (IBase *)pServer;
+
+	try {
+		IServer* pIServer = dynamic_cast<IServer*>(pIBaseClass);
+		if (!pIServer)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIServer->Stop();
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_server_closeallconnections(LibOIE_Server pServer)
+{
+	IBase* pIBaseClass = (IBase *)pServer;
+
+	try {
+		IServer* pIServer = dynamic_cast<IServer*>(pIBaseClass);
+		if (!pIServer)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIServer->CloseAllConnections();
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_server_setthreadcount(LibOIE_Server pServer, LibOIE_uint32 nThreadCount)
+{
+	IBase* pIBaseClass = (IBase *)pServer;
+
+	try {
+		IServer* pIServer = dynamic_cast<IServer*>(pIBaseClass);
+		if (!pIServer)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIServer->SetThreadCount(nThreadCount);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_server_setbuffersize(LibOIE_Server pServer, LibOIE_uint32 nRCVBufferSize)
+{
+	IBase* pIBaseClass = (IBase *)pServer;
+
+	try {
+		IServer* pIServer = dynamic_cast<IServer*>(pIBaseClass);
+		if (!pIServer)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIServer->SetBufferSize(nRCVBufferSize);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_server_acceptdevice(LibOIE_Server pServer, const char * pDeviceName, const char * pApplicationName, const char * pVersionName, LibOIE_uint32 * pRuleID)
+{
+	IBase* pIBaseClass = (IBase *)pServer;
+
+	try {
+		if (pDeviceName == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if (pApplicationName == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if (pVersionName == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if (pRuleID == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		std::string sDeviceName(pDeviceName);
+		std::string sApplicationName(pApplicationName);
+		std::string sVersionName(pVersionName);
+		IServer* pIServer = dynamic_cast<IServer*>(pIBaseClass);
+		if (!pIServer)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		*pRuleID = pIServer->AcceptDevice(sDeviceName, sApplicationName, sVersionName);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_server_unacceptdevice(LibOIE_Server pServer, LibOIE_uint32 nRuleID)
+{
+	IBase* pIBaseClass = (IBase *)pServer;
+
+	try {
+		IServer* pIServer = dynamic_cast<IServer*>(pIBaseClass);
+		if (!pIServer)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIServer->UnAcceptDevice(nRuleID);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_server_clearaccepteddevices(LibOIE_Server pServer)
+{
+	IBase* pIBaseClass = (IBase *)pServer;
+
+	try {
+		IServer* pIServer = dynamic_cast<IServer*>(pIBaseClass);
+		if (!pIServer)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIServer->ClearAcceptedDevices();
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_server_listconnections(LibOIE_Server pServer, LibOIE_ConnectionIterator * pConnectionIteratorInstance)
+{
+	IBase* pIBaseClass = (IBase *)pServer;
+
+	try {
+		if (pConnectionIteratorInstance == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IBase* pBaseConnectionIteratorInstance(nullptr);
+		IServer* pIServer = dynamic_cast<IServer*>(pIBaseClass);
+		if (!pIServer)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pBaseConnectionIteratorInstance = pIServer->ListConnections();
+
+		*pConnectionIteratorInstance = (IBase*)(pBaseConnectionIteratorInstance);
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_server_setconnectionacceptedcallback(LibOIE_Server pServer, LibOIEConnectionAcceptedCallback pCallback)
+{
+	IBase* pIBaseClass = (IBase *)pServer;
+
+	try {
+		IServer* pIServer = dynamic_cast<IServer*>(pIBaseClass);
+		if (!pIServer)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIServer->SetConnectionAcceptedCallback(pCallback);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_server_setconnectionrejectedcallback(LibOIE_Server pServer, LibOIEConnectionRejectedCallback pCallback)
+{
+	IBase* pIBaseClass = (IBase *)pServer;
+
+	try {
+		IServer* pIServer = dynamic_cast<IServer*>(pIBaseClass);
+		if (!pIServer)
+			throw ELibOIEInterfaceException(LIBOIE_ERROR_INVALIDCAST);
+		
+		pIServer->SetConnectionRejectedCallback(pCallback);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+
+/*************************************************************************************************************************
+ Function table lookup implementation
+**************************************************************************************************************************/
+
+LibOIEResult LibOIE::Impl::LibOIE_GetProcAddress (const char * pProcName, void ** ppProcAddress)
+{
+	if (pProcName == nullptr)
+		return LIBOIE_ERROR_INVALIDPARAM;
+	if (ppProcAddress == nullptr)
+		return LIBOIE_ERROR_INVALIDPARAM;
+	*ppProcAddress = nullptr;
+	std::string sProcName (pProcName);
+	
+	if (sProcName == "liboie_iterator_movenext") 
+		*ppProcAddress = (void*) &liboie_iterator_movenext;
+	if (sProcName == "liboie_iterator_moveprevious") 
+		*ppProcAddress = (void*) &liboie_iterator_moveprevious;
+	if (sProcName == "liboie_iterator_getcurrent") 
+		*ppProcAddress = (void*) &liboie_iterator_getcurrent;
+	if (sProcName == "liboie_iterator_clone") 
+		*ppProcAddress = (void*) &liboie_iterator_clone;
+	if (sProcName == "liboie_iterator_count") 
+		*ppProcAddress = (void*) &liboie_iterator_count;
+	if (sProcName == "liboie_datapackage_getrawpayload") 
+		*ppProcAddress = (void*) &liboie_datapackage_getrawpayload;
+	if (sProcName == "liboie_datapackage_release") 
+		*ppProcAddress = (void*) &liboie_datapackage_release;
+	if (sProcName == "liboie_pyrodatapackageiterator_getcurrentpyrodatapackage") 
+		*ppProcAddress = (void*) &liboie_pyrodatapackageiterator_getcurrentpyrodatapackage;
+	if (sProcName == "liboie_octdatapackageiterator_getcurrentoctdatapackage") 
+		*ppProcAddress = (void*) &liboie_octdatapackageiterator_getcurrentoctdatapackage;
+	if (sProcName == "liboie_remotefunctioncall_getfunctionname") 
+		*ppProcAddress = (void*) &liboie_remotefunctioncall_getfunctionname;
+	if (sProcName == "liboie_remotefunctioncall_addparameter") 
+		*ppProcAddress = (void*) &liboie_remotefunctioncall_addparameter;
+	if (sProcName == "liboie_remotefunctioncall_send") 
+		*ppProcAddress = (void*) &liboie_remotefunctioncall_send;
+	if (sProcName == "liboie_connection_disconnect") 
+		*ppProcAddress = (void*) &liboie_connection_disconnect;
+	if (sProcName == "liboie_connection_setrequesttimeout") 
+		*ppProcAddress = (void*) &liboie_connection_setrequesttimeout;
+	if (sProcName == "liboie_connection_setmaxerrorcount") 
+		*ppProcAddress = (void*) &liboie_connection_setmaxerrorcount;
+	if (sProcName == "liboie_connection_setmaxmemorycount") 
+		*ppProcAddress = (void*) &liboie_connection_setmaxmemorycount;
+	if (sProcName == "liboie_connection_setbufferfile") 
+		*ppProcAddress = (void*) &liboie_connection_setbufferfile;
+	if (sProcName == "liboie_connection_unsetbufferfile") 
+		*ppProcAddress = (void*) &liboie_connection_unsetbufferfile;
+	if (sProcName == "liboie_connection_setcheckaliveinterval") 
+		*ppProcAddress = (void*) &liboie_connection_setcheckaliveinterval;
+	if (sProcName == "liboie_connection_retrievefirmwareversion") 
+		*ppProcAddress = (void*) &liboie_connection_retrievefirmwareversion;
+	if (sProcName == "liboie_connection_updatefirmware") 
+		*ppProcAddress = (void*) &liboie_connection_updatefirmware;
+	if (sProcName == "liboie_connection_startfirmware") 
+		*ppProcAddress = (void*) &liboie_connection_startfirmware;
+	if (sProcName == "liboie_connection_stopfirmware") 
+		*ppProcAddress = (void*) &liboie_connection_stopfirmware;
+	if (sProcName == "liboie_connection_setconnectionerrorcallback") 
+		*ppProcAddress = (void*) &liboie_connection_setconnectionerrorcallback;
+	if (sProcName == "liboie_connection_clearerrors") 
+		*ppProcAddress = (void*) &liboie_connection_clearerrors;
+	if (sProcName == "liboie_connection_geterrorcount") 
+		*ppProcAddress = (void*) &liboie_connection_geterrorcount;
+	if (sProcName == "liboie_connection_geterror") 
+		*ppProcAddress = (void*) &liboie_connection_geterror;
+	if (sProcName == "liboie_connection_createremotefunctioncall") 
+		*ppProcAddress = (void*) &liboie_connection_createremotefunctioncall;
+	if (sProcName == "liboie_connection_getbufferedpyropackages") 
+		*ppProcAddress = (void*) &liboie_connection_getbufferedpyropackages;
+	if (sProcName == "liboie_connection_getbufferedoctpackages") 
+		*ppProcAddress = (void*) &liboie_connection_getbufferedoctpackages;
+	if (sProcName == "liboie_connectioniterator_getcurrentconnection") 
+		*ppProcAddress = (void*) &liboie_connectioniterator_getcurrentconnection;
+	if (sProcName == "liboie_server_start") 
+		*ppProcAddress = (void*) &liboie_server_start;
+	if (sProcName == "liboie_server_stop") 
+		*ppProcAddress = (void*) &liboie_server_stop;
+	if (sProcName == "liboie_server_closeallconnections") 
+		*ppProcAddress = (void*) &liboie_server_closeallconnections;
+	if (sProcName == "liboie_server_setthreadcount") 
+		*ppProcAddress = (void*) &liboie_server_setthreadcount;
+	if (sProcName == "liboie_server_setbuffersize") 
+		*ppProcAddress = (void*) &liboie_server_setbuffersize;
+	if (sProcName == "liboie_server_acceptdevice") 
+		*ppProcAddress = (void*) &liboie_server_acceptdevice;
+	if (sProcName == "liboie_server_unacceptdevice") 
+		*ppProcAddress = (void*) &liboie_server_unacceptdevice;
+	if (sProcName == "liboie_server_clearaccepteddevices") 
+		*ppProcAddress = (void*) &liboie_server_clearaccepteddevices;
+	if (sProcName == "liboie_server_listconnections") 
+		*ppProcAddress = (void*) &liboie_server_listconnections;
+	if (sProcName == "liboie_server_setconnectionacceptedcallback") 
+		*ppProcAddress = (void*) &liboie_server_setconnectionacceptedcallback;
+	if (sProcName == "liboie_server_setconnectionrejectedcallback") 
+		*ppProcAddress = (void*) &liboie_server_setconnectionrejectedcallback;
+	if (sProcName == "liboie_getversion") 
+		*ppProcAddress = (void*) &liboie_getversion;
+	if (sProcName == "liboie_getlasterror") 
+		*ppProcAddress = (void*) &liboie_getlasterror;
+	if (sProcName == "liboie_releaseinstance") 
+		*ppProcAddress = (void*) &liboie_releaseinstance;
+	if (sProcName == "liboie_acquireinstance") 
+		*ppProcAddress = (void*) &liboie_acquireinstance;
+	if (sProcName == "liboie_getsymbollookupmethod") 
+		*ppProcAddress = (void*) &liboie_getsymbollookupmethod;
+	if (sProcName == "liboie_createserver") 
+		*ppProcAddress = (void*) &liboie_createserver;
+	
+	if (*ppProcAddress == nullptr) 
+		return LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	return LIBOIE_SUCCESS;
+}
+
+/*************************************************************************************************************************
+ Global functions implementation
+**************************************************************************************************************************/
+LibOIEResult liboie_getversion(LibOIE_uint32 * pMajor, LibOIE_uint32 * pMinor, LibOIE_uint32 * pMicro)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		if (!pMajor)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if (!pMinor)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if (!pMicro)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		CWrapper::GetVersion(*pMajor, *pMinor, *pMicro);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_getlasterror(LibOIE_Base pInstance, const LibOIE_uint32 nErrorMessageBufferSize, LibOIE_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		if ( (!pErrorMessageBuffer) && !(pErrorMessageNeededChars) )
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		if (pHasError == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IBase* pIBaseClassInstance = (IBase *)pInstance;
+		IBase* pIInstance = dynamic_cast<IBase*>(pIBaseClassInstance);
+		if (!pIInstance)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDCAST);
+		
+		std::string sErrorMessage("");
+		*pHasError = CWrapper::GetLastError(pIInstance, sErrorMessage);
+
+		if (pErrorMessageNeededChars)
+			*pErrorMessageNeededChars = (LibOIE_uint32) (sErrorMessage.size()+1);
+		if (pErrorMessageBuffer) {
+			if (sErrorMessage.size() >= nErrorMessageBufferSize)
+				throw ELibOIEInterfaceException (LIBOIE_ERROR_BUFFERTOOSMALL);
+			for (size_t iErrorMessage = 0; iErrorMessage < sErrorMessage.size(); iErrorMessage++)
+				pErrorMessageBuffer[iErrorMessage] = sErrorMessage[iErrorMessage];
+			pErrorMessageBuffer[sErrorMessage.size()] = 0;
+		}
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_releaseinstance(LibOIE_Base pInstance)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		IBase* pIBaseClassInstance = (IBase *)pInstance;
+		IBase* pIInstance = dynamic_cast<IBase*>(pIBaseClassInstance);
+		if (!pIInstance)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDCAST);
+		
+		CWrapper::ReleaseInstance(pIInstance);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_acquireinstance(LibOIE_Base pInstance)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		IBase* pIBaseClassInstance = (IBase *)pInstance;
+		IBase* pIInstance = dynamic_cast<IBase*>(pIBaseClassInstance);
+		if (!pIInstance)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDCAST);
+		
+		CWrapper::AcquireInstance(pIInstance);
+
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_getsymbollookupmethod(LibOIE_pvoid * pSymbolLookupMethod)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		if (pSymbolLookupMethod == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		*pSymbolLookupMethod = (void*)&LibOIE::Impl::LibOIE_GetProcAddress;
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibOIEResult liboie_createserver(LibOIE_Server * pInstance)
+{
+	IBase* pIBaseClass = nullptr;
+
+	try {
+		if (pInstance == nullptr)
+			throw ELibOIEInterfaceException (LIBOIE_ERROR_INVALIDPARAM);
+		IBase* pBaseInstance(nullptr);
+		pBaseInstance = CWrapper::CreateServer();
+
+		*pInstance = (IBase*)(pBaseInstance);
+		return LIBOIE_SUCCESS;
+	}
+	catch (ELibOIEInterfaceException & Exception) {
+		return handleLibOIEException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
diff --git a/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_types.hpp b/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_types.hpp
new file mode 100644
index 00000000..5f378c1e
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Interfaces/liboie_types.hpp
@@ -0,0 +1,181 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated C++-Header file with basic types in
+order to allow an easy use of ScanLab Open Interface Extension
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBOIE_TYPES_HEADER_CPP
+#define __LIBOIE_TYPES_HEADER_CPP
+
+
+/*************************************************************************************************************************
+ Scalar types definition
+**************************************************************************************************************************/
+
+#ifdef LIBOIE_USELEGACYINTEGERTYPES
+
+typedef unsigned char LibOIE_uint8;
+typedef unsigned short LibOIE_uint16 ;
+typedef unsigned int LibOIE_uint32;
+typedef unsigned long long LibOIE_uint64;
+typedef char LibOIE_int8;
+typedef short LibOIE_int16;
+typedef int LibOIE_int32;
+typedef long long LibOIE_int64;
+
+#else // LIBOIE_USELEGACYINTEGERTYPES
+
+#include <stdint.h>
+
+typedef uint8_t LibOIE_uint8;
+typedef uint16_t LibOIE_uint16;
+typedef uint32_t LibOIE_uint32;
+typedef uint64_t LibOIE_uint64;
+typedef int8_t LibOIE_int8;
+typedef int16_t LibOIE_int16;
+typedef int32_t LibOIE_int32;
+typedef int64_t LibOIE_int64 ;
+
+#endif // LIBOIE_USELEGACYINTEGERTYPES
+
+typedef float LibOIE_single;
+typedef double LibOIE_double;
+
+/*************************************************************************************************************************
+ General type definitions
+**************************************************************************************************************************/
+
+typedef LibOIE_int32 LibOIEResult;
+typedef void * LibOIEHandle;
+typedef void * LibOIE_pvoid;
+
+/*************************************************************************************************************************
+ Version for LibOIE
+**************************************************************************************************************************/
+
+#define LIBOIE_VERSION_MAJOR 1
+#define LIBOIE_VERSION_MINOR 0
+#define LIBOIE_VERSION_MICRO 0
+#define LIBOIE_VERSION_PRERELEASEINFO ""
+#define LIBOIE_VERSION_BUILDINFO ""
+
+/*************************************************************************************************************************
+ Error constants for LibOIE
+**************************************************************************************************************************/
+
+#define LIBOIE_SUCCESS 0
+#define LIBOIE_ERROR_NOTIMPLEMENTED 1
+#define LIBOIE_ERROR_INVALIDPARAM 2
+#define LIBOIE_ERROR_INVALIDCAST 3
+#define LIBOIE_ERROR_BUFFERTOOSMALL 4
+#define LIBOIE_ERROR_GENERICEXCEPTION 5
+#define LIBOIE_ERROR_COULDNOTLOADLIBRARY 6
+#define LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT 7
+#define LIBOIE_ERROR_INCOMPATIBLEBINARYVERSION 8
+
+/*************************************************************************************************************************
+ Error strings for LibOIE
+**************************************************************************************************************************/
+
+inline const char * LIBOIE_GETERRORSTRING (LibOIEResult nErrorCode) {
+  switch (nErrorCode) {
+    case LIBOIE_SUCCESS: return "no error";
+    case LIBOIE_ERROR_NOTIMPLEMENTED: return "functionality not implemented";
+    case LIBOIE_ERROR_INVALIDPARAM: return "an invalid parameter was passed";
+    case LIBOIE_ERROR_INVALIDCAST: return "a type cast failed";
+    case LIBOIE_ERROR_BUFFERTOOSMALL: return "a provided buffer is too small";
+    case LIBOIE_ERROR_GENERICEXCEPTION: return "a generic exception occurred";
+    case LIBOIE_ERROR_COULDNOTLOADLIBRARY: return "the library could not be loaded";
+    case LIBOIE_ERROR_COULDNOTFINDLIBRARYEXPORT: return "a required exported symbol could not be found in the library";
+    case LIBOIE_ERROR_INCOMPATIBLEBINARYVERSION: return "the version of the binary interface does not match the bindings interface";
+    default: return "unknown error";
+  }
+}
+
+/*************************************************************************************************************************
+ Declaration of handle classes 
+**************************************************************************************************************************/
+
+typedef LibOIEHandle LibOIE_Base;
+typedef LibOIEHandle LibOIE_Iterator;
+typedef LibOIEHandle LibOIE_DataPackage;
+typedef LibOIEHandle LibOIE_PyroDataPackage;
+typedef LibOIEHandle LibOIE_PyroDataPackageIterator;
+typedef LibOIEHandle LibOIE_OctDataPackage;
+typedef LibOIEHandle LibOIE_OctDataPackageIterator;
+typedef LibOIEHandle LibOIE_RemoteFunctionCall;
+typedef LibOIEHandle LibOIE_Connection;
+typedef LibOIEHandle LibOIE_ConnectionIterator;
+typedef LibOIEHandle LibOIE_Server;
+
+namespace LibOIE {
+
+  /*************************************************************************************************************************
+   Declaration of function pointers 
+  **************************************************************************************************************************/
+  
+  /**
+  * ConnectionAcceptedCallback - A callback that is triggered when a device or application has connected.
+  *
+  * @param[in] pConnectionInstance - Returns whether the calculation should be aborted
+  * @param[in] pUserData - Userdata that is passed to the callback function
+  */
+  typedef void(*ConnectionAcceptedCallback)(LibOIE_Connection, LibOIE_pvoid);
+  
+  /**
+  * ConnectionRejectedCallback - A callback that is triggered when a device or application has been denied connecting.
+  *
+  * @param[in] pDeviceName - Device name that was sent.
+  * @param[in] pApplicationName - Application name that was sent.
+  * @param[in] pVersionName - Version name that was sent.
+  * @param[in] pUserData - Userdata that is passed to the callback function
+  */
+  typedef void(*ConnectionRejectedCallback)(const char *, const char *, const char *, LibOIE_pvoid);
+  
+  /**
+  * ConnectionErrorCallback - A callback that is triggered when a connection sends an error state.
+  *
+  * @param[in] pErrorMessage - Error string that was triggered.
+  */
+  typedef void(*ConnectionErrorCallback)(const char *);
+  
+} // namespace LibOIE;
+
+// define legacy C-names for enums, structs and function types
+typedef LibOIE::ConnectionAcceptedCallback LibOIEConnectionAcceptedCallback;
+typedef LibOIE::ConnectionRejectedCallback LibOIEConnectionRejectedCallback;
+typedef LibOIE::ConnectionErrorCallback LibOIEConnectionErrorCallback;
+
+#endif // __LIBOIE_TYPES_HEADER_CPP
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/LICENSE b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/LICENSE
new file mode 100644
index 00000000..3ac9185c
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 IronsDu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/README.md b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/README.md
new file mode 100644
index 00000000..04c46d4d
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/README.md
@@ -0,0 +1,122 @@
+Brynet
+=======
+Header Only Cross platform high performance TCP network library using C++ 11.
+
+[![996.icu](https://img.shields.io/badge/link-996.icu-red.svg)](https://996.icu)
+[![LICENSE](https://img.shields.io/badge/license-NPL%20(The%20996%20Prohibited%20License)-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE)
+[![SonarCloud](https://sonarcloud.io/api/project_badges/measure?project=brynet&metric=alert_status)](https://sonarcloud.io/dashboard/index/brynet)
+[![Platform](https://img.shields.io/badge/Platform-Linux,%20Windows,%20MacOS-green.svg?style=flat-square)](https://github.com/IronsDu/brynet)
+
+## Build status
+Windows : [![Build status](https://ci.appveyor.com/api/projects/status/a2bxg5umbwwdb01k/branch/master?svg=true)](https://ci.appveyor.com/project/IronsDu/brynet/branch/master) 
+Linux/MacOS : [![Build Status](https://travis-ci.org/IronsDu/brynet.svg?branch=master)](https://travis-ci.org/IronsDu/brynet)
+
+## Features
+* Header only
+* Cross platform (Linux | Windows | MacOS)
+* High performance and safety use.
+* None depend
+* Multi-threaded
+* SSL support
+* Support HTTP�HTTPS�WebSocket
+* IPv6 support
+
+## Documentation
+- [简体中文](https://github.com/IronsDu/brynet/blob/master/docs/main.zh-cn.md)
+
+## Compatibility
+* Visual C++ 2013+ (32/64-bit)
+* GCC 4.8+ (32/64-bit)
+* Clang (Supported C++ 11)
+
+## Macro
+* BRYNET_VERSION
+* BRYNET_USE_OPENSSL
+
+
+## Build Example
+1. `cmake . -Dbrynet_BUILD_EXAMPLES=ON -Dbrynet_BUILD_TESTS=ON`
+2. If you use Windows, please open brynet.sln then build. If on Linux or MacOS, only enter `make`.
+
+## Only Install
+1. `cmake .`
+2. `sudo make install`
+
+## Usages
+* [Examples](#examples)
+* [Users](#users)
+
+## Benchmark
+   Under localhost, use CentOS 6.5 virtual mahcine(host machine is Win10 i5)
+* PingPong
+
+  Benchamrk's server and client both only use one thread, and packet size is 4k
+
+  ![PingPong](image/pingpong.png "PingPong")
+
+* Broadcast
+
+  Server use two network threads and one logic thread, client use one network(also process logic) thread. every packet size is 46 bytes.
+  every packet contain client's id.
+  server broadcast packet to all client when recv one packet from any client.
+  client send one packet when recv packet from server and packet's id equal self.
+
+  ![Broadcast](image/broadcast.png "Broadcast")
+
+* Ab HTTP(1 network thread)
+        Document Path:          /
+        Document Length:        18 bytes
+
+        Concurrency Level:      100
+        Time taken for tests:   5.871 seconds
+        Complete requests:      100000
+        Failed requests:        0
+        Write errors:           0
+        Non-2xx responses:      100000
+        Total transferred:      5200000 bytes
+        HTML transferred:       1800000 bytes
+        Requests per second:    17031.62 [#/sec] (mean)
+        Time per request:       5.871 [ms] (mean)
+        Time per request:       0.059 [ms] (mean, across all concurrent requests)
+        Transfer rate:          864.89 [Kbytes/sec] received
+
+        Connection Times (ms)
+                    min  mean[+/-sd] median   max
+        Connect:        0    2   0.7      2       8
+        Processing:     1    3   0.7      3       9
+        Waiting:        0    3   0.8      3       8
+        Total:          2    6   0.8      6      11
+
+        Percentage of the requests served within a certain time (ms)
+        50%      6
+        66%      6
+        75%      6
+        80%      6
+        90%      7
+        95%      7
+        98%      7
+        99%      8
+        100%     11 (longest request)
+
+
+Examples
+----------------------------
+* [PingPongServer](https://github.com/IronsDu/dodo/blob/master/examples/PingPongServer.cpp)
+* [PingPongClient](https://github.com/IronsDu/dodo/blob/master/examples/PingPongClient.cpp)
+* [BroadCastServer](https://github.com/IronsDu/dodo/blob/master/examples/BroadCastServer.cpp)
+* [BroadCastClient](https://github.com/IronsDu/dodo/blob/master/examples/BroadCastClient.cpp)
+* [Http&Websocket Server](https://github.com/IronsDu/dodo/blob/master/examples/HttpServer.cpp)
+* [HttpServerClient](https://github.com/IronsDu/dodo/blob/master/examples/HttpClient.cpp)
+* [BenchWebsocket](https://github.com/IronsDu/dodo/blob/master/examples/BenchWebsocket.cpp) benchmark websocket client
+* [PromiseReceive](https://github.com/IronsDu/brynet/blob/master/examples/PromiseReceive.cpp) use the promise style receive http response
+* [WebSocketProxy](https://github.com/IronsDu/dodo/blob/master/examples/WebBinaryProxy.cpp) one proxy server between websocket client and binary protocol server
+* more examples please see [examples](https://github.com/IronsDu/dodo/tree/master/examples);
+
+Users
+----------------------------
+* [ARK - distributed plugin framework](https://github.com/ArkNX/ARK)
+* [Redis proxy](https://github.com/IronsDu/DBProxy)
+* [gayrpc](https://github.com/IronsDu/gayrpc)
+* [gaylord - distributed virtual actor framework](https://github.com/IronsDu/gaylord)
+* [Joynet - Lua network library](https://github.com/IronsDu/Joynet)
+* [grpc-gateway](https://github.com/IronsDu/grpc-gateway)
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/Version.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/Version.hpp
new file mode 100644
index 00000000..89a5883f
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/Version.hpp
@@ -0,0 +1,3 @@
+#pragma once
+
+#define BRYNET_VERSION 1007000
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Any.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Any.hpp
new file mode 100644
index 00000000..6e3d58ae
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Any.hpp
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <brynet/base/CPP_VERSION.hpp>
+
+#ifdef BRYNET_HAVE_LANG_CXX17
+#include <any>
+#else
+#include <cstdint>
+#endif
+
+namespace brynet { namespace base {
+
+#ifdef BRYNET_HAVE_LANG_CXX17
+    using BrynetAny = std::any;
+
+    template<typename T>
+    auto cast(const BrynetAny& ud)
+    {
+        return std::any_cast<T>(&ud);
+    }
+#else
+    using BrynetAny = int64_t;
+    template<typename T>
+    const T* cast(const BrynetAny& ud)
+    {
+        return static_cast<const T*>(&ud);
+    }
+#endif
+
+} }
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/AppStatus.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/AppStatus.hpp
new file mode 100644
index 00000000..88867fc4
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/AppStatus.hpp
@@ -0,0 +1,47 @@
+#pragma once
+
+#include <cstdbool>
+#include <cstdio>
+#include <signal.h>
+
+#include <brynet/base/Platform.hpp>
+
+#ifdef BRYNET_PLATFORM_WINDOWS
+#include <conio.h>
+#else
+#include <termios.h>
+#include <unistd.h>
+#include <fcntl.h>
+#endif
+
+namespace brynet { namespace base {
+
+    static bool app_kbhit()
+    {
+#ifdef BRYNET_PLATFORM_WINDOWS
+        return _kbhit();
+#else
+        struct termios oldt;
+        tcgetattr(STDIN_FILENO, &oldt);
+        auto newt = oldt;
+        newt.c_lflag &= ~(ICANON | ECHO);
+        tcsetattr(STDIN_FILENO, TCSANOW, &newt);
+        const auto oldf = fcntl(STDIN_FILENO, F_GETFL, 0);
+        fcntl(STDIN_FILENO, F_SETFL, oldf | O_NONBLOCK);
+
+        const auto ch = getchar();
+
+        tcsetattr(STDIN_FILENO, TCSANOW, &oldt);
+        fcntl(STDIN_FILENO, F_SETFL, oldf);
+
+        if (ch != EOF)
+        {
+            ungetc(ch, stdin);
+            return true;
+        }
+
+        return false;
+#endif
+    }
+
+} }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Array.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Array.hpp
new file mode 100644
index 00000000..0b0624f0
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Array.hpp
@@ -0,0 +1,129 @@
+#pragma once
+
+#include <cstdbool>
+#include <cstring>
+#include <cstdlib>
+#include <cassert>
+
+namespace brynet { namespace base {
+
+    struct array_s
+    {
+        void*   buffer;
+        size_t  buffer_size;
+        size_t  element_size;
+        size_t  element_num;
+    };
+
+    static void array_delete(struct array_s* self)
+    {
+        if (self == nullptr)
+        {
+            return;
+        }
+
+        if (self->buffer != nullptr)
+        {
+            free(self->buffer);
+            self->buffer = nullptr;
+        }
+
+        self->element_num = 0;
+        free(self);
+        self = nullptr;
+    }
+
+    static struct array_s* array_new(size_t num, size_t element_size)
+    {
+        auto ret = (struct array_s*)malloc(sizeof(struct array_s));
+        if (ret == nullptr)
+        {
+            return nullptr;
+        }
+
+        const auto buffer_size = num * element_size;
+
+        ret->buffer_size = 0;
+        ret->element_size = 0;
+        ret->element_num = 0;
+        ret->buffer = malloc(buffer_size);
+
+        if (ret->buffer != nullptr)
+        {
+            ret->element_size = element_size;
+            ret->element_num = num;
+            ret->buffer_size = buffer_size;
+        }
+        else
+        {
+            array_delete(ret);
+            ret = nullptr;
+        }
+
+        return ret;
+    }
+
+    static void* array_at(struct array_s* self, size_t index)
+    {
+        void* ret = nullptr;
+
+        if (index < self->element_num)
+        {
+            ret = (char*)(self->buffer) + (index * self->element_size);
+        }
+        else
+        {
+            assert(false);
+        }
+
+        return ret;
+    }
+
+    static bool array_set(struct array_s* self, size_t index, const void* data)
+    {
+        void* old_data = array_at(self, index);
+
+        if (old_data != nullptr)
+        {
+            memcpy(old_data, data, self->element_size);
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    static bool array_increase(struct array_s* self, size_t increase_num)
+    {
+        if (increase_num == 0)
+        {
+            return false;
+        }
+
+        const auto new_buffer_size = self->buffer_size + increase_num * self->element_size;
+        auto new_buffer = malloc(new_buffer_size);
+
+        if (new_buffer != nullptr)
+        {
+            memcpy(new_buffer, self->buffer, self->buffer_size);
+            free(self->buffer);
+            self->buffer = new_buffer;
+            self->element_num += increase_num;
+            self->buffer_size = new_buffer_size;
+
+            return true;
+        }
+        else
+        {
+            assert(false);
+            return false;
+        }
+    }
+
+    static size_t array_num(const struct array_s* self)
+    {
+        return self->element_num;
+    }
+
+} }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Buffer.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Buffer.hpp
new file mode 100644
index 00000000..f1ed8b30
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Buffer.hpp
@@ -0,0 +1,189 @@
+#pragma once
+
+#include <cstdbool>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+
+namespace brynet { namespace base {
+
+    struct buffer_s
+    {
+        char*   data;
+        size_t  data_len;
+
+        size_t  write_pos;
+        size_t  read_pos;
+    };
+
+    static void buffer_delete(struct buffer_s* self)
+    {
+        if (self == nullptr)
+        {
+            return;
+        }
+
+        if (self->data != nullptr)
+        {
+            free(self->data);
+            self->data = nullptr;
+        }
+
+        free(self);
+        self = nullptr;
+    }
+
+    static struct buffer_s* buffer_new(size_t buffer_size)
+    {
+        struct buffer_s* ret = (struct buffer_s*)malloc(sizeof(struct buffer_s));
+        if (ret == nullptr)
+        {
+            return nullptr;
+        }
+
+        ret->data_len = 0;
+        ret->read_pos = 0;
+        ret->write_pos = 0;
+        ret->data = (char*)malloc(sizeof(char) * buffer_size);
+
+        if (ret->data != nullptr)
+        {
+            ret->data_len = buffer_size;
+        }
+        else
+        {
+            buffer_delete(ret);
+            ret = nullptr;
+        }
+
+        return ret;
+    }
+
+    static size_t buffer_getreadvalidcount(struct buffer_s* self)
+    {
+        return self->write_pos - self->read_pos;
+    }
+
+    static void buffer_adjustto_head(struct buffer_s* self)
+    {
+        if (self->read_pos == 0)
+        {
+            return;
+        }
+
+        const auto len = buffer_getreadvalidcount(self);
+        if (len > 0)
+        {
+            memmove(self->data, self->data + self->read_pos, len);
+        }
+
+        self->read_pos = 0;
+        self->write_pos = len;
+    }
+
+    static void buffer_init(struct buffer_s* self)
+    {
+        self->read_pos = 0;
+        self->write_pos = 0;
+    }
+
+    static size_t buffer_getwritepos(struct buffer_s* self)
+    {
+        return self->write_pos;
+    }
+
+    static size_t buffer_getreadpos(struct buffer_s* self)
+    {
+        return self->read_pos;
+    }
+
+    static bool buffer_addwritepos(struct buffer_s* self, size_t value)
+    {
+        const size_t temp = self->write_pos + value;
+        if (temp <= self->data_len)
+        {
+            self->write_pos = temp;
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    static bool buffer_addreadpos(struct buffer_s* self, size_t value)
+    {
+        const size_t temp = self->read_pos + value;
+        if (temp <= self->data_len)
+        {
+            self->read_pos = temp;
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    static size_t buffer_getwritevalidcount(struct buffer_s* self)
+    {
+        return self->data_len - self->write_pos;
+    }
+
+    static size_t buffer_getsize(struct buffer_s* self)
+    {
+        return self->data_len;
+    }
+
+    static char* buffer_getwriteptr(struct buffer_s* self)
+    {
+        if (self->write_pos < self->data_len)
+        {
+            return self->data + self->write_pos;
+        }
+        else
+        {
+            return nullptr;
+        }
+    }
+
+    static char* buffer_getreadptr(struct buffer_s* self)
+    {
+        if (self->read_pos < self->data_len)
+        {
+            return self->data + self->read_pos;
+        }
+        else
+        {
+            return nullptr;
+        }
+    }
+
+    static bool buffer_write(struct buffer_s* self, const char* data, size_t len)
+    {
+        bool write_ret = true;
+
+        if (buffer_getwritevalidcount(self) >= len)
+        {
+            /*  Ö±½ÓдÈë    */
+            memcpy(buffer_getwriteptr(self), data, len);
+            buffer_addwritepos(self, len);
+        }
+        else
+        {
+            size_t left_len = self->data_len - buffer_getreadvalidcount(self);
+            if (left_len >= len)
+            {
+                buffer_adjustto_head(self);
+                buffer_write(self, data, len);
+            }
+            else
+            {
+                write_ret = false;
+            }
+        }
+
+        return write_ret;
+    }
+
+} }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/CPP_VERSION.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/CPP_VERSION.hpp
new file mode 100644
index 00000000..f32b49d4
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/CPP_VERSION.hpp
@@ -0,0 +1,16 @@
+#pragma once
+
+#if (__cplusplus >= 201103L || \
+     (defined(_MSC_VER) && _MSC_VER >= 1800))
+#define BRYNET_HAVE_LANG_CXX11 1
+#endif
+
+#if (__cplusplus >= 201402L || \
+     (defined(_MSC_VER) && _MSC_VER >= 1900))
+#define BRYNET_HAVE_LANG_CXX14 1
+#endif
+
+#if (__cplusplus >= 201703L || \
+     (defined(_MSC_VER) && _MSC_VER >= 1910))
+#define BRYNET_HAVE_LANG_CXX17 1
+#endif
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Noexcept.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Noexcept.hpp
new file mode 100644
index 00000000..316de5ef
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Noexcept.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#include <brynet/base/CPP_VERSION.hpp>
+
+#ifdef BRYNET_HAVE_LANG_CXX17
+#define BRYNET_NOEXCEPT noexcept
+#else
+#define BRYNET_NOEXCEPT
+#endif
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/NonCopyable.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/NonCopyable.hpp
new file mode 100644
index 00000000..5de4493c
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/NonCopyable.hpp
@@ -0,0 +1,16 @@
+#pragma once
+
+namespace brynet { namespace base {
+
+    class NonCopyable
+    {
+    public:
+        NonCopyable(const NonCopyable&) = delete;
+        const NonCopyable& operator=(const NonCopyable&) = delete;
+
+    protected:
+        NonCopyable() = default;
+        ~NonCopyable() = default;
+    };
+
+} }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Packet.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Packet.hpp
new file mode 100644
index 00000000..7f18d0c1
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Packet.hpp
@@ -0,0 +1,398 @@
+#pragma once
+
+#include <cstdint>
+#include <cassert>
+#include <cstdbool>
+#include <cstring>
+#include <string>
+
+#include <brynet/base/NonCopyable.hpp>
+#include <brynet/base/endian/Endian.hpp>
+
+namespace brynet { namespace base {
+
+    class BasePacketWriter : public NonCopyable
+    {
+    public:
+        BasePacketWriter(char* buffer,
+            size_t len,
+            bool useBigEndian = true,
+            bool isAutoMalloc = false)
+            :
+            mIsAutoMalloc(isAutoMalloc),
+            mBigEndian(useBigEndian)
+        {
+            mMaxLen = len;
+            mPos = 0;
+            mBuffer = buffer;
+            mMallocBuffer = nullptr;
+        }
+
+        virtual ~BasePacketWriter()
+        {
+            if (mMallocBuffer != nullptr)
+            {
+                free(mMallocBuffer);
+                mMallocBuffer = nullptr;
+            }
+        }
+
+        void    init()
+        {
+            mPos = 0;
+        }
+
+        size_t getMaxLen() const
+        {
+            return mMaxLen;
+        }
+
+        size_t      getPos() const
+        {
+            return mPos;
+        }
+
+        const char* getData() const
+        {
+            return mBuffer;
+        }
+
+        bool    isAutoGrow() const
+        {
+            return mIsAutoMalloc;
+        }
+
+        bool    writeBool(bool value)
+        {
+            static_assert(sizeof(bool) == sizeof(int8_t), "");
+            return writeBuffer((char*)&value, sizeof(value));
+        }
+        bool    writeINT8(int8_t value)
+        {
+            return writeBuffer((char*)&value, sizeof(value));
+        }
+        bool    writeUINT8(uint8_t value)
+        {
+            return writeBuffer((char*)&value, sizeof(value));
+        }
+        bool    writeINT16(int16_t value)
+        {
+            value = endian::hostToNetwork16(value, mBigEndian);
+            return writeBuffer((char*)&value, sizeof(value));
+        }
+        bool    writeUINT16(uint16_t value)
+        {
+            value = endian::hostToNetwork16(value, mBigEndian);
+            return writeBuffer((char*)&value, sizeof(value));
+        }
+        bool    writeINT32(int32_t value)
+        {
+            value = endian::hostToNetwork32(value, mBigEndian);
+            return writeBuffer((char*)&value, sizeof(value));
+        }
+        bool    writeUINT32(uint32_t value)
+        {
+            value = endian::hostToNetwork32(value, mBigEndian);
+            return writeBuffer((char*)&value, sizeof(value));
+        }
+        bool    writeINT64(int64_t value)
+        {
+            value = endian::hostToNetwork64(value, mBigEndian);
+            return writeBuffer((char*)&value, sizeof(value));
+        }
+        bool    writeUINT64(uint64_t value)
+        {
+            value = endian::hostToNetwork64(value, mBigEndian);
+            return writeBuffer((char*)&value, sizeof(value));
+        }
+
+        bool    writeBinary(const std::string& binary)
+        {
+            return writeBuffer(binary.c_str(), binary.size());
+        }
+        bool    writeBinary(const char* binary, size_t binaryLen)
+        {
+            return writeBuffer(binary, binaryLen);
+        }
+        bool    writeBuffer(const char* buffer, size_t len)
+        {
+            growBuffer(len);
+
+            if (mMaxLen < (mPos + len))
+            {
+                return false;
+            }
+
+            memcpy(mBuffer + mPos, buffer, len);
+            mPos += len;
+            return true;
+        }
+
+        BasePacketWriter & operator << (const bool &v)
+        {
+            writeBool(v);
+            return *this;
+        }
+        BasePacketWriter & operator << (const uint8_t &v)
+        {
+            writeUINT8(v);
+            return *this;
+        }
+        BasePacketWriter & operator << (const int8_t &v)
+        {
+            writeINT8(v);
+            return *this;
+        }
+        BasePacketWriter & operator << (const int16_t &v)
+        {
+            writeINT16(v);
+            return *this;
+        }
+        BasePacketWriter & operator << (const uint16_t &v)
+        {
+            writeUINT16(v);
+            return *this;
+        }
+        BasePacketWriter & operator << (const int32_t &v)
+        {
+            writeINT32(v);
+            return *this;
+        }
+        BasePacketWriter & operator << (const uint32_t &v)
+        {
+            writeUINT32(v);
+            return *this;
+        }
+        BasePacketWriter & operator << (const int64_t &v)
+        {
+            writeINT64(v);
+            return *this;
+        }
+        BasePacketWriter & operator << (const uint64_t &v)
+        {
+            writeUINT64(v);
+            return *this;
+        }
+        BasePacketWriter & operator << (const char* const &v)
+        {
+            writeBinary(v);
+            return *this;
+        }
+        BasePacketWriter & operator << (const std::string &v)
+        {
+            writeBinary(v);
+            return *this;
+        }
+
+    private:
+        // 为了��直接<<导致没有指定字节�导致��BUG,因为此函数设置为�有
+        template<typename T>
+        BasePacketWriter & operator << (const T& v)
+        {
+            static_assert(!std::is_pointer<T>::value, "T must is't a pointer");
+            static_assert(std::is_class <T>::value, "T must a class or struct type");
+            static_assert(std::is_pod <T>::value, "T must a pod type");
+            writeBuffer((const char*)&v, sizeof(v));
+            return *this;
+        }
+
+        template<typename Arg1, typename... Args>
+        void            writev(const Arg1& arg1, const Args&... args)
+        {
+            this->operator<<(arg1);
+            writev(args...);
+        }
+
+        void            writev()
+        {
+        }
+
+    protected:
+        void        growBuffer(size_t len)
+        {
+            if (!mIsAutoMalloc || (mPos + len) <= mMaxLen)
+            {
+                return;
+            }
+
+            auto newBuffer = (char*)malloc(mMaxLen + len);
+            if (newBuffer == nullptr)
+            {
+                return;
+            }
+
+            memcpy(newBuffer, mBuffer, mPos);
+
+            if (mMallocBuffer != nullptr)
+            {
+                free(mMallocBuffer);
+                mMallocBuffer = nullptr;
+            }
+
+            mMaxLen += len;
+            mMallocBuffer = newBuffer;
+            mBuffer = newBuffer;
+        }
+
+    protected:
+        const bool  mIsAutoMalloc;
+        bool        mBigEndian;
+        size_t      mPos;
+        size_t      mMaxLen;
+        char*       mBuffer;
+        char*       mMallocBuffer;
+    };
+
+    class BasePacketReader
+    {
+    public:
+        BasePacketReader(const char* buffer,
+            size_t len,
+            bool useBigEndian = true) :
+            mBigEndian(useBigEndian),
+            mMaxLen(len)
+        {
+            mPos = 0;
+            mBuffer = buffer;
+        }
+
+        virtual ~BasePacketReader() = default;
+
+        size_t          getLeft() const
+        {
+            if (mPos > mMaxLen)
+            {
+                throw std::out_of_range("current pos is greater than max len");
+            }
+            return mMaxLen - mPos;
+        }
+
+        const char*     getBuffer() const
+        {
+            return mBuffer;
+        }
+
+        void            skipAll()
+        {
+            mPos = mMaxLen;
+        }
+
+        size_t          getPos() const
+        {
+            return mPos;
+        }
+
+        size_t          getMaxPos() const
+        {
+            return mMaxLen;
+        }
+
+        void            addPos(size_t diff)
+        {
+            const auto tmpPos = mPos + diff;
+            if (tmpPos > mMaxLen)
+            {
+                throw std::out_of_range("diff is to big");
+            }
+
+            mPos = tmpPos;
+        }
+
+        bool            readBool()
+        {
+            static_assert(sizeof(bool) == sizeof(int8_t), "");
+            bool  value = false;
+            read(value);
+            return value;
+        }
+        int8_t          readINT8()
+        {
+            int8_t  value = 0;
+            read(value);
+            return value;
+        }
+        uint8_t         readUINT8()
+        {
+            uint8_t  value = 0;
+            read(value);
+            return value;
+        }
+        int16_t         readINT16()
+        {
+            int16_t  value = 0;
+            read(value);
+            return endian::networkToHost16(value, mBigEndian);
+        }
+        uint16_t        readUINT16()
+        {
+            uint16_t  value = 0;
+            read(value);
+            return endian::networkToHost16(value, mBigEndian);
+        }
+        int32_t         readINT32()
+        {
+            int32_t  value = 0;
+            read(value);
+            return endian::networkToHost32(value, mBigEndian);
+        }
+        uint32_t        readUINT32()
+        {
+            uint32_t  value = 0;
+            read(value);
+            return endian::networkToHost32(value, mBigEndian);
+        }
+        int64_t         readINT64()
+        {
+            int64_t  value = 0;
+            read(value);
+            return endian::networkToHost64(value, mBigEndian);
+        }
+        uint64_t        readUINT64()
+        {
+            uint64_t  value = 0;
+            read(value);
+            return endian::networkToHost64(value, mBigEndian);
+        }
+
+    private:
+        // 为了��直接read(uintXXX)导致没有指定字节�造��患BUG,因为此函数设置为�有
+        template<typename T>
+        void            read(T& value)
+        {
+            static_assert(std::is_same<T, typename std::remove_pointer<T>::type>::value,
+                "T must a nomal type");
+            static_assert(std::is_pod<T>::value,
+                "T must a pod type");
+
+            if ((mPos + sizeof(value)) > mMaxLen)
+            {
+                throw std::out_of_range("T size is to big");
+            }
+
+            value = *(T*)(mBuffer + mPos);
+            mPos += sizeof(value);
+        }
+
+    protected:
+        const bool      mBigEndian;
+        const size_t    mMaxLen;
+        const char*     mBuffer;
+        size_t          mPos;
+    };
+
+    template<size_t SIZE>
+    class AutoMallocPacket : public BasePacketWriter
+    {
+    public:
+        explicit AutoMallocPacket(bool useBigEndian = true,
+            bool isAutoMalloc = false)
+            :
+            BasePacketWriter(mData, SIZE, useBigEndian, isAutoMalloc)
+        {}
+    private:
+        char        mData[SIZE];
+    };
+
+    using BigPacket = AutoMallocPacket<32 * 1024>;
+
+} }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Platform.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Platform.hpp
new file mode 100644
index 00000000..763118cd
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Platform.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#if defined _MSC_VER || defined __MINGW32__
+#define BRYNET_PLATFORM_WINDOWS
+#elif defined __APPLE_CC__ || defined __APPLE__
+#define BRYNET_PLATFORM_DARWIN
+#else
+#define BRYNET_PLATFORM_LINUX
+#endif
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Stack.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Stack.hpp
new file mode 100644
index 00000000..339bad32
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Stack.hpp
@@ -0,0 +1,175 @@
+#pragma once
+
+#include <cstdbool>
+#include <cstring>
+#include <cstdlib>
+#include <cassert>
+#include <cstdint>
+
+#include <brynet/base/Array.hpp>
+
+namespace brynet { namespace base {
+
+    struct stack_s
+    {
+        struct array_s* array;
+        size_t          element_size;
+
+        size_t          element_num;
+        size_t          front;              /*  Õ»µ×  */
+        size_t          num;                /*  Õ»ÓÐЧԪËØ´óС */
+    };
+
+    static void stack_delete(struct stack_s* self)
+    {
+        if (self == nullptr)
+        {
+            return;
+        }
+
+        if (self->array != nullptr)
+        {
+            array_delete(self->array);
+            self->array = nullptr;
+        }
+
+        self->element_num = 0;
+        self->front = 0;
+        self->num = 0;
+        free(self);
+        self = nullptr;
+    }
+
+    static struct stack_s* stack_new(size_t num, size_t element_size)
+    {
+        struct stack_s* ret = (struct stack_s*)malloc(sizeof(struct stack_s));
+        if (ret == nullptr)
+        {
+            return nullptr;
+        }
+
+        ret->element_size = 0;
+        ret->element_num = 0;
+        ret->front = 0;
+        ret->num = 0;
+        ret->array = array_new(num, element_size);
+
+        if (ret->array != nullptr)
+        {
+            ret->element_size = element_size;
+            ret->element_num = num;
+        }
+        else
+        {
+            stack_delete(ret);
+            ret = nullptr;
+        }
+
+        return ret;
+    }
+
+    static void stack_init(struct stack_s* self)
+    {
+        self->front = 0;
+        self->num = 0;
+    }
+
+    static size_t stack_num(struct stack_s* self)
+    {
+        return self->num;
+    }
+
+    static bool stack_increase(struct stack_s* self, size_t increase_num)
+    {
+        struct array_s* tmp = array_new(self->element_num + increase_num, 
+            self->element_size);
+        if (tmp == nullptr)
+        {
+            return false;
+        }
+
+        {
+            size_t current_num = self->element_num;
+            size_t current_stack_num = stack_num(self);
+            for (size_t i = 0; i < current_stack_num; ++i)
+            {
+                array_set(tmp, i, array_at(self->array, (self->front + i) % current_num));
+            }
+
+            self->front = 0;
+            array_delete(self->array);
+            self->array = tmp;
+            self->element_num = array_num(self->array);
+        }
+
+        return true;
+    }
+
+    static size_t stack_size(struct stack_s* self)
+    {
+        return self->element_num;
+    }
+
+    static bool stack_isfull(struct stack_s* self)
+    {
+        return (self->num == self->element_num);
+    }
+    
+    /*  stackµÄstack_push»áÔڿռ䲻×ãµÄʱºò×Ô¶¯Ôö³¤(ͨ¹ýstack_increase)  */
+    static bool stack_push(struct stack_s* self, const void* data)
+    {
+        if (stack_isfull(self))
+        {
+            stack_increase(self, stack_size(self));
+        }
+
+        if (stack_isfull(self))
+        {
+            return false;
+        }
+
+        array_set(self->array, (self->front + self->num) % self->element_num, data);
+        self->num++;
+        return true;
+    }
+
+    static void* stack_front(struct stack_s* self)
+    {
+        void* ret = nullptr;
+
+        if (stack_num(self) > 0)
+        {
+            ret = array_at(self->array, self->front);
+        }
+
+        return ret;
+    }
+
+    static void* stack_popfront(struct stack_s* self)
+    {
+        void* ret = stack_front(self);
+
+        if (ret != nullptr)
+        {
+            self->num--;
+            self->front++;
+            self->front %= self->element_num;
+        }
+
+        return ret;
+    }
+
+    static void* stack_popback(struct stack_s* self)
+    {
+        void* ret = nullptr;
+
+        if (stack_num(self) > 0)
+        {
+            self->num--;
+            ret = array_at(self->array, (self->front + self->num) % self->element_num);
+        }
+
+        return ret;
+    }
+
+} }
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Timer.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Timer.hpp
new file mode 100644
index 00000000..363d48ec
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/Timer.hpp
@@ -0,0 +1,167 @@
+#pragma once
+
+#include <functional>
+#include <queue>
+#include <memory>
+#include <vector>
+#include <chrono>
+#include <mutex>
+
+#include <brynet/base/Noexcept.hpp>
+
+namespace brynet { namespace base {
+
+    class TimerMgr;
+
+    class Timer final
+    {
+    public:
+        using Ptr = std::shared_ptr<Timer>;
+        using WeakPtr = std::weak_ptr<Timer>;
+        using Callback = std::function<void(void)>;
+
+        Timer(std::chrono::steady_clock::time_point startTime,
+            std::chrono::nanoseconds lastTime,
+            Callback&& callback) BRYNET_NOEXCEPT
+            :
+            mCallback(std::move(callback)),
+            mStartTime(startTime),
+            mLastTime(lastTime)
+        {
+        }
+
+        const std::chrono::steady_clock::time_point& getStartTime() const
+        {
+            return mStartTime;
+        }
+
+        const std::chrono::nanoseconds& getLastTime() const
+        {
+            return mLastTime;
+        }
+
+        std::chrono::nanoseconds    getLeftTime() const
+        {
+            const auto now = std::chrono::steady_clock::now();
+            return getLastTime() - (now - getStartTime());
+        }
+
+        void    cancel()
+        {
+            std::call_once(mExecuteOnceFlag, [this]() {
+                    mCallback = nullptr;
+                });
+        }
+
+    private:
+        void            operator() ()
+        {
+            Callback callback;
+            std::call_once(mExecuteOnceFlag, [&callback, this]() {
+                    callback = std::move(mCallback);
+                    mCallback = nullptr;
+                });
+
+            if (callback != nullptr)
+            {
+                callback();
+            }
+        }
+
+    private:
+        std::once_flag                                  mExecuteOnceFlag;
+        Callback                                        mCallback;
+        const std::chrono::steady_clock::time_point     mStartTime;
+        const std::chrono::nanoseconds                  mLastTime;
+
+        friend class TimerMgr;
+    };
+
+    class TimerMgr final
+    {
+    public:
+        using Ptr = std::shared_ptr<TimerMgr>;
+
+        template<typename F, typename ...TArgs>
+        Timer::WeakPtr  addTimer(
+            std::chrono::nanoseconds timeout,
+            F&& callback, 
+            TArgs&& ...args)
+        {
+            auto timer = std::make_shared<Timer>(
+                std::chrono::steady_clock::now(),
+                std::chrono::nanoseconds(timeout),
+                std::bind(std::forward<F>(callback), std::forward<TArgs>(args)...));
+            mTimers.push(timer);
+
+            return timer;
+        }
+
+        void        addTimer(const Timer::Ptr& timer)
+        {
+            mTimers.push(timer);
+        }
+
+        void        schedule()
+        {
+            while (!mTimers.empty())
+            {
+                auto tmp = mTimers.top();
+                if (tmp->getLeftTime() > std::chrono::nanoseconds::zero())
+                {
+                    break;
+                }
+
+                mTimers.pop();
+                (*tmp)();
+            }
+        }
+
+        bool        isEmpty() const
+        {
+            return mTimers.empty();
+        }
+
+        // if timer empty, return zero
+        std::chrono::nanoseconds    nearLeftTime() const
+        {
+            if (mTimers.empty())
+            {
+                return std::chrono::nanoseconds::zero();
+            }
+
+            auto result = mTimers.top()->getLeftTime();
+            if (result < std::chrono::nanoseconds::zero())
+            {
+                return std::chrono::nanoseconds::zero();
+            }
+
+            return result;
+        }
+
+        void    clear()
+        {
+            while (!mTimers.empty())
+            {
+                mTimers.pop();
+            }
+        }
+
+    private:
+        class CompareTimer
+        {
+        public:
+            bool operator() (const Timer::Ptr& left, 
+                const Timer::Ptr& right) const
+            {
+                const auto startDiff = left->getStartTime() - right->getStartTime();
+                const auto lastDiff = left->getLastTime() - right->getLastTime();
+                const auto diff = startDiff.count() + lastDiff.count();
+                return diff > 0;
+            }
+        };
+
+        std::priority_queue<Timer::Ptr, std::vector<Timer::Ptr>, CompareTimer>  mTimers;
+    };
+
+} }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/WaitGroup.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/WaitGroup.hpp
new file mode 100644
index 00000000..1d44fcc6
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/WaitGroup.hpp
@@ -0,0 +1,65 @@
+#pragma once
+
+#include <mutex>
+#include <atomic>
+#include <memory>
+#include <condition_variable>
+#include <chrono>
+
+#include <brynet/base/NonCopyable.hpp>
+
+namespace brynet { namespace base {
+
+    class WaitGroup : public NonCopyable
+    {
+    public:
+        typedef std::shared_ptr<WaitGroup> Ptr;
+
+        static Ptr Create()
+        {
+            struct make_shared_enabler : public WaitGroup {};
+            return std::make_shared<make_shared_enabler>();
+        }
+
+    public:
+        void    add(int i = 1)
+        {
+            mCounter += i;
+        }
+
+        void    done()
+        {
+            mCounter--;
+            mCond.notify_all();
+        }
+
+        void    wait()
+        {
+            std::unique_lock<std::mutex> l(mMutex);
+            mCond.wait(l, [&] { return mCounter <= 0; });
+        }
+
+        template<class Rep, class Period>
+        void    wait(const std::chrono::duration<Rep, Period>& timeout)
+        {
+            std::unique_lock<std::mutex> l(mMutex);
+            mCond.wait_for(l, timeout, [&] {
+                return mCounter <= 0;
+            });
+        }
+
+    private:
+        WaitGroup()
+            :
+            mCounter(0)
+        {
+        }
+
+        virtual ~WaitGroup() = default;
+
+    private:
+        std::mutex              mMutex;
+        std::atomic<int>        mCounter;
+        std::condition_variable mCond;
+    };
+} }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/crypto/Base64.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/crypto/Base64.hpp
new file mode 100644
index 00000000..135a77ea
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/crypto/Base64.hpp
@@ -0,0 +1,105 @@
+#ifndef _BRYNET_BASE_BASE64_H
+#define _BRYNET_BASE_BASE64_H
+
+#include <string>
+
+namespace brynet { namespace base { namespace crypto {
+
+    static const std::string base64_chars =
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        "abcdefghijklmnopqrstuvwxyz"
+        "0123456789+/";
+
+    static bool is_base64(unsigned char c)
+    {
+        return (isalnum(c) || (c == '+') || (c == '/'));
+    }
+
+    static std::string base64_encode(unsigned char const* bytes_to_encode, unsigned int in_len)
+    {
+        std::string ret;
+        int i = 0;
+        int j = 0;
+        unsigned char char_array_3[3];
+        unsigned char char_array_4[4];
+
+        while (in_len--) {
+            char_array_3[i++] = *(bytes_to_encode++);
+            if (i == 3) {
+                char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
+                char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
+                char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
+                char_array_4[3] = char_array_3[2] & 0x3f;
+
+                for (i = 0; (i < 4); i++)
+                    ret += base64_chars[char_array_4[i]];
+                i = 0;
+            }
+        }
+
+        if (i)
+        {
+            for (j = i; j < 3; j++)
+                char_array_3[j] = '\0';
+
+            char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
+            char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
+            char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
+            char_array_4[3] = char_array_3[2] & 0x3f;
+
+            for (j = 0; (j < i + 1); j++)
+                ret += base64_chars[char_array_4[j]];
+
+            while ((i++ < 3))
+                ret += '=';
+
+        }
+
+        return ret;
+    }
+
+    static std::string base64_decode(std::string const& encoded_string)
+    {
+        int in_len = encoded_string.size();
+        int i = 0;
+        int j = 0;
+        int in_ = 0;
+        unsigned char char_array_4[4], char_array_3[3];
+        std::string ret;
+
+        while (in_len-- && (encoded_string[in_] != '=') && is_base64(encoded_string[in_])) {
+            char_array_4[i++] = encoded_string[in_]; in_++;
+            if (i == 4) {
+                for (i = 0; i < 4; i++)
+                    char_array_4[i] = base64_chars.find(char_array_4[i]);
+
+                char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+                char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+                char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
+
+                for (i = 0; (i < 3); i++)
+                    ret += char_array_3[i];
+                i = 0;
+            }
+        }
+
+        if (i) {
+            for (j = i; j < 4; j++)
+                char_array_4[j] = 0;
+
+            for (j = 0; j < 4; j++)
+                char_array_4[j] = base64_chars.find(char_array_4[j]);
+
+            char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+            char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+            char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
+
+            for (j = 0; (j < i - 1); j++) ret += char_array_3[j];
+        }
+
+        return ret;
+    }
+
+} } }
+
+#endif
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/crypto/SHA1.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/crypto/SHA1.hpp
new file mode 100644
index 00000000..197d3ccd
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/crypto/SHA1.hpp
@@ -0,0 +1,496 @@
+/*
+  100% free public domain implementation of the SHA-1 algorithm
+  by Dominik Reichl <dominik.reichl@t-online.de>
+  Web: http://www.dominik-reichl.de/
+
+  Version 2.1 - 2012-06-19
+  - Deconstructor (resetting internal variables) is now only
+    implemented if SHA1_WIPE_VARIABLES is defined (which is the
+    default).
+  - Renamed inclusion guard to contain a GUID.
+  - Demo application is now using C++/STL objects and functions.
+  - Unicode build of the demo application now outputs the hashes of both
+    the ANSI and Unicode representations of strings.
+  - Various other demo application improvements.
+
+  Version 2.0 - 2012-06-14
+  - Added 'limits.h' include.
+  - Renamed inclusion guard and macros for compliancy (names beginning
+    with an underscore are reserved).
+
+  Version 1.9 - 2011-11-10
+  - Added Unicode test vectors.
+  - Improved support for hashing files using the HashFile method that
+    are larger than 4 GB.
+  - Improved file hashing performance (by using a larger buffer).
+  - Disabled unnecessary compiler warnings.
+  - Internal variables are now private.
+
+  Version 1.8 - 2009-03-16
+  - Converted project files to Visual Studio 2008 format.
+  - Added Unicode support for HashFile utility method.
+  - Added support for hashing files using the HashFile method that are
+    larger than 2 GB.
+  - HashFile now returns an error code instead of copying an error
+    message into the output buffer.
+  - GetHash now returns an error code and validates the input parameter.
+  - Added ReportHashStl STL utility method.
+  - Added REPORT_HEX_SHORT reporting mode.
+  - Improved Linux compatibility of test program.
+
+  Version 1.7 - 2006-12-21
+  - Fixed buffer underrun warning that appeared when compiling with
+    Borland C Builder (thanks to Rex Bloom and Tim Gallagher for the
+    patch).
+  - Breaking change: ReportHash writes the final hash to the start
+    of the buffer, i.e. it's not appending it to the string anymore.
+  - Made some function parameters const.
+  - Added Visual Studio 2005 project files to demo project.
+
+  Version 1.6 - 2005-02-07 (thanks to Howard Kapustein for patches)
+  - You can set the endianness in your files, no need to modify the
+    header file of the CSHA1 class anymore.
+  - Aligned data support.
+  - Made support/compilation of the utility functions (ReportHash and
+    HashFile) optional (useful when bytes count, for example in embedded
+    environments).
+
+  Version 1.5 - 2005-01-01
+  - 64-bit compiler compatibility added.
+  - Made variable wiping optional (define SHA1_WIPE_VARIABLES).
+  - Removed unnecessary variable initializations.
+  - ROL32 improvement for the Microsoft compiler (using _rotl).
+
+  Version 1.4 - 2004-07-22
+  - CSHA1 now compiles fine with GCC 3.3 under Mac OS X (thanks to Larry
+    Hastings).
+
+  Version 1.3 - 2003-08-17
+  - Fixed a small memory bug and made a buffer array a class member to
+    ensure correct working when using multiple CSHA1 class instances at
+    one time.
+
+  Version 1.2 - 2002-11-16
+  - Borlands C++ compiler seems to have problems with string addition
+    using sprintf. Fixed the bug which caused the digest report function
+    not to work properly. CSHA1 is now Borland compatible.
+
+  Version 1.1 - 2002-10-11
+  - Removed two unnecessary header file includes and changed BOOL to
+    bool. Fixed some minor bugs in the web page contents.
+
+  Version 1.0 - 2002-06-20
+  - First official release.
+
+  ================ Test Vectors ================
+
+  SHA1("abc" in ANSI) =
+    A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+  SHA1("abc" in Unicode LE) =
+    9F04F41A 84851416 2050E3D6 8C1A7ABB 441DC2B5
+
+  SHA1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+    in ANSI) =
+    84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+  SHA1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+    in Unicode LE) =
+    51D7D876 9AC72C40 9C5B0E3F 69C60ADC 9A039014
+
+  SHA1(A million repetitions of "a" in ANSI) =
+    34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+  SHA1(A million repetitions of "a" in Unicode LE) =
+    C4609560 A108A0C6 26AA7F2B 38A65566 739353C5
+*/
+
+#ifndef SHA1_H_A545E61D43E9404E8D736869AB3CBFE7
+#define SHA1_H_A545E61D43E9404E8D736869AB3CBFE7
+
+#if !defined(SHA1_UTILITY_FUNCTIONS) && !defined(SHA1_NO_UTILITY_FUNCTIONS)
+#define SHA1_UTILITY_FUNCTIONS
+#endif
+
+#if !defined(SHA1_STL_FUNCTIONS) && !defined(SHA1_NO_STL_FUNCTIONS)
+#define SHA1_STL_FUNCTIONS
+#if !defined(SHA1_UTILITY_FUNCTIONS)
+#error STL functions require SHA1_UTILITY_FUNCTIONS.
+#endif
+#endif
+
+#include <memory.h>
+#include <limits.h>
+
+#ifdef SHA1_UTILITY_FUNCTIONS
+#include <stdio.h>
+#include <string.h>
+#endif
+
+#ifdef SHA1_STL_FUNCTIONS
+#include <string>
+#endif
+
+#ifdef _MSC_VER
+#include <stdlib.h>
+#endif
+
+// You can define the endian mode in your files without modifying the SHA-1
+// source files. Just #define SHA1_LITTLE_ENDIAN or #define SHA1_BIG_ENDIAN
+// in your files, before including the SHA1.h header file. If you don't
+// define anything, the class defaults to little endian.
+#if !defined(SHA1_LITTLE_ENDIAN) && !defined(SHA1_BIG_ENDIAN)
+#define SHA1_LITTLE_ENDIAN
+#endif
+
+// If you want variable wiping, #define SHA1_WIPE_VARIABLES, if not,
+// #define SHA1_NO_WIPE_VARIABLES. If you don't define anything, it
+// defaults to wiping.
+#if !defined(SHA1_WIPE_VARIABLES) && !defined(SHA1_NO_WIPE_VARIABLES)
+#define SHA1_WIPE_VARIABLES
+#endif
+
+#if defined(SHA1_HAS_TCHAR)
+#include <tchar.h>
+#else
+#ifdef _MSC_VER
+#include <tchar.h>
+#else
+#ifndef TCHAR
+#define TCHAR char
+#endif
+#ifndef _T
+#define _T(__x) (__x)
+#define _tmain main
+#define _tprintf printf
+#define _getts gets
+#define _tcslen strlen
+#define _tfopen fopen
+#define _tcscpy strcpy
+#define _tcscat strcat
+#define _sntprintf snprintf
+#endif
+#endif
+#endif
+
+///////////////////////////////////////////////////////////////////////////
+// Define variable types
+
+#ifndef UINT_8
+#ifdef _MSC_VER // Compiling with Microsoft compiler
+#define UINT_8 unsigned __int8
+#else // !_MSC_VER
+#define UINT_8 unsigned char
+#endif // _MSC_VER
+#endif
+
+#ifndef UINT_32
+#ifdef _MSC_VER // Compiling with Microsoft compiler
+#define UINT_32 unsigned __int32
+#else // !_MSC_VER
+#if (ULONG_MAX == 0xFFFFFFFFUL)
+#define UINT_32 unsigned long
+#else
+#define UINT_32 unsigned int
+#endif
+#endif // _MSC_VER
+#endif // UINT_32
+
+#ifndef INT_64
+#ifdef _MSC_VER // Compiling with Microsoft compiler
+#define INT_64 __int64
+#else // !_MSC_VER
+#define INT_64 long long
+#endif // _MSC_VER
+#endif // INT_64
+
+#ifndef UINT_64
+#ifdef _MSC_VER // Compiling with Microsoft compiler
+#define UINT_64 unsigned __int64
+#else // !_MSC_VER
+#define UINT_64 unsigned long long
+#endif // _MSC_VER
+#endif // UINT_64
+
+///////////////////////////////////////////////////////////////////////////
+// Declare SHA-1 workspace
+
+typedef union
+{
+	UINT_8 c[64];
+	UINT_32 l[16];
+} SHA1_WORKSPACE_BLOCK;
+
+
+#define SHA1_MAX_FILE_BUFFER (32 * 20 * 820)
+
+// Rotate p_val32 by p_nBits bits to the left
+#ifndef ROL32
+#ifdef _MSC_VER
+#define ROL32(p_val32,p_nBits) _rotl(p_val32,p_nBits)
+#else
+#define ROL32(p_val32,p_nBits) (((p_val32)<<(p_nBits))|((p_val32)>>(32-(p_nBits))))
+#endif
+#endif
+
+#ifdef SHA1_LITTLE_ENDIAN
+#define SHABLK0(i) (m_block->l[i] = \
+	(ROL32(m_block->l[i],24) & 0xFF00FF00) | (ROL32(m_block->l[i],8) & 0x00FF00FF))
+#else
+#define SHABLK0(i) (m_block->l[i])
+#endif
+
+#define SHABLK(i) (m_block->l[i&15] = ROL32(m_block->l[(i+13)&15] ^ \
+	m_block->l[(i+8)&15] ^ m_block->l[(i+2)&15] ^ m_block->l[i&15],1))
+
+// SHA-1 rounds
+#define S_R0(v,w,x,y,z,i) {z+=((w&(x^y))^y)+SHABLK0(i)+0x5A827999+ROL32(v,5);w=ROL32(w,30);}
+#define S_R1(v,w,x,y,z,i) {z+=((w&(x^y))^y)+SHABLK(i)+0x5A827999+ROL32(v,5);w=ROL32(w,30);}
+#define S_R2(v,w,x,y,z,i) {z+=(w^x^y)+SHABLK(i)+0x6ED9EBA1+ROL32(v,5);w=ROL32(w,30);}
+#define S_R3(v,w,x,y,z,i) {z+=(((w|x)&y)|(w&x))+SHABLK(i)+0x8F1BBCDC+ROL32(v,5);w=ROL32(w,30);}
+#define S_R4(v,w,x,y,z,i) {z+=(w^x^y)+SHABLK(i)+0xCA62C1D6+ROL32(v,5);w=ROL32(w,30);}
+
+
+class CSHA1
+{
+public:
+#ifdef SHA1_UTILITY_FUNCTIONS
+	// Different formats for ReportHash(Stl)
+	enum REPORT_TYPE
+	{
+		REPORT_HEX = 0,
+		REPORT_DIGIT = 1,
+		REPORT_HEX_SHORT = 2
+	};
+#endif
+
+	// Constructor and destructor
+    CSHA1()
+    {
+        (void)m_reserved0;
+        (void)m_reserved1;
+        m_block = (SHA1_WORKSPACE_BLOCK*)m_workspace;
+
+        Reset();
+    }
+
+#ifdef SHA1_WIPE_VARIABLES
+    ~CSHA1()
+    {
+        Reset();
+    }
+#endif
+
+    void Reset()
+    {
+        // SHA1 initialization constants
+        m_state[0] = 0x67452301;
+        m_state[1] = 0xEFCDAB89;
+        m_state[2] = 0x98BADCFE;
+        m_state[3] = 0x10325476;
+        m_state[4] = 0xC3D2E1F0;
+
+        m_count[0] = 0;
+        m_count[1] = 0;
+    }
+
+	// Hash in binary data and strings
+    void Update(const UINT_8* pbData, UINT_32 uLen)
+    {
+        UINT_32 j = ((m_count[0] >> 3) & 0x3F);
+
+        if ((m_count[0] += (uLen << 3)) < (uLen << 3))
+            ++m_count[1]; // Overflow
+
+        m_count[1] += (uLen >> 29);
+
+        UINT_32 i;
+        if ((j + uLen) > 63)
+        {
+            i = 64 - j;
+            memcpy(&m_buffer[j], pbData, i);
+            Transform(m_state, m_buffer);
+
+            for (; (i + 63) < uLen; i += 64)
+                Transform(m_state, &pbData[i]);
+
+            j = 0;
+        }
+        else i = 0;
+
+        if ((uLen - i) != 0)
+            memcpy(&m_buffer[j], &pbData[i], uLen - i);
+    }
+
+#ifdef SHA1_UTILITY_FUNCTIONS
+	// Hash in file contents
+    bool HashFile(const TCHAR* tszFileName)
+    {
+        if (tszFileName == NULL) return false;
+
+        FILE* fpIn = _tfopen(tszFileName, _T("rb"));
+        if (fpIn == NULL) return false;
+
+        UINT_8* pbData = new UINT_8[SHA1_MAX_FILE_BUFFER];
+        if (pbData == NULL) { fclose(fpIn); return false; }
+
+        bool bSuccess = true;
+        while (true)
+        {
+            const size_t uRead = fread(pbData, 1, SHA1_MAX_FILE_BUFFER, fpIn);
+
+            if (uRead > 0)
+                Update(pbData, static_cast<UINT_32>(uRead));
+
+            if (uRead < SHA1_MAX_FILE_BUFFER)
+            {
+                if (feof(fpIn) == 0) bSuccess = false;
+                break;
+            }
+        }
+
+        fclose(fpIn);
+        delete[] pbData;
+        return bSuccess;
+    }
+#endif
+
+	// Finalize hash; call it before using ReportHash(Stl)
+    void Final()
+    {
+        UINT_32 i;
+
+        UINT_8 pbFinalCount[8];
+        for (i = 0; i < 8; ++i)
+            pbFinalCount[i] = static_cast<UINT_8>((m_count[((i >= 4) ? 0 : 1)] >>
+            ((3 - (i & 3)) * 8)) & 0xFF); // Endian independent
+
+        Update((UINT_8*)"\200", 1);
+
+        while ((m_count[0] & 504) != 448)
+            Update((UINT_8*)"\0", 1);
+
+        Update(pbFinalCount, 8); // Cause a Transform()
+
+        for (i = 0; i < 20; ++i)
+            m_digest[i] = static_cast<UINT_8>((m_state[i >> 2] >> ((3 -
+            (i & 3)) * 8)) & 0xFF);
+
+        // Wipe variables for security reasons
+#ifdef SHA1_WIPE_VARIABLES
+        memset(m_buffer, 0, 64);
+        memset(m_state, 0, 20);
+        memset(m_count, 0, 8);
+        memset(pbFinalCount, 0, 8);
+        Transform(m_state, m_buffer);
+#endif
+    }
+
+#ifdef SHA1_UTILITY_FUNCTIONS
+    bool ReportHash(TCHAR* tszReport, REPORT_TYPE rtReportType = REPORT_HEX) const
+    {
+        if (tszReport == NULL) return false;
+
+        TCHAR tszTemp[16];
+
+        if ((rtReportType == REPORT_HEX) || (rtReportType == REPORT_HEX_SHORT))
+        {
+            _sntprintf(tszTemp, 15, _T("%02X"), m_digest[0]);
+            _tcscpy(tszReport, tszTemp);
+
+            const TCHAR* lpFmt = ((rtReportType == REPORT_HEX) ? _T(" %02X") : _T("%02X"));
+            for (size_t i = 1; i < 20; ++i)
+            {
+                _sntprintf(tszTemp, 15, lpFmt, m_digest[i]);
+                _tcscat(tszReport, tszTemp);
+            }
+        }
+        else if (rtReportType == REPORT_DIGIT)
+        {
+            _sntprintf(tszTemp, 15, _T("%u"), m_digest[0]);
+            _tcscpy(tszReport, tszTemp);
+
+            for (size_t i = 1; i < 20; ++i)
+            {
+                _sntprintf(tszTemp, 15, _T(" %u"), m_digest[i]);
+                _tcscat(tszReport, tszTemp);
+            }
+        }
+        else return false;
+
+        return true;
+    }
+#endif
+
+#ifdef SHA1_STL_FUNCTIONS
+    bool ReportHashStl(std::basic_string<TCHAR>& strOut, REPORT_TYPE rtReportType =
+        REPORT_HEX) const
+    {
+        TCHAR tszOut[84];
+        const bool bResult = ReportHash(tszOut, rtReportType);
+        if (bResult) strOut = tszOut;
+        return bResult;
+    }
+#endif
+
+	// Get the raw message digest (20 bytes)
+    bool GetHash(UINT_8* pbDest20) const
+    {
+        if (pbDest20 == NULL) return false;
+        memcpy(pbDest20, m_digest, 20);
+        return true;
+    }
+
+private:
+	// Private SHA-1 transformation
+    void Transform(UINT_32* pState, const UINT_8* pBuffer)
+    {
+        UINT_32 a = pState[0], b = pState[1], c = pState[2], d = pState[3], e = pState[4];
+
+        memcpy(m_block, pBuffer, 64);
+
+        // 4 rounds of 20 operations each, loop unrolled
+        S_R0(a, b, c, d, e, 0); S_R0(e, a, b, c, d, 1); S_R0(d, e, a, b, c, 2); S_R0(c, d, e, a, b, 3);
+        S_R0(b, c, d, e, a, 4); S_R0(a, b, c, d, e, 5); S_R0(e, a, b, c, d, 6); S_R0(d, e, a, b, c, 7);
+        S_R0(c, d, e, a, b, 8); S_R0(b, c, d, e, a, 9); S_R0(a, b, c, d, e, 10); S_R0(e, a, b, c, d, 11);
+        S_R0(d, e, a, b, c, 12); S_R0(c, d, e, a, b, 13); S_R0(b, c, d, e, a, 14); S_R0(a, b, c, d, e, 15);
+        S_R1(e, a, b, c, d, 16); S_R1(d, e, a, b, c, 17); S_R1(c, d, e, a, b, 18); S_R1(b, c, d, e, a, 19);
+        S_R2(a, b, c, d, e, 20); S_R2(e, a, b, c, d, 21); S_R2(d, e, a, b, c, 22); S_R2(c, d, e, a, b, 23);
+        S_R2(b, c, d, e, a, 24); S_R2(a, b, c, d, e, 25); S_R2(e, a, b, c, d, 26); S_R2(d, e, a, b, c, 27);
+        S_R2(c, d, e, a, b, 28); S_R2(b, c, d, e, a, 29); S_R2(a, b, c, d, e, 30); S_R2(e, a, b, c, d, 31);
+        S_R2(d, e, a, b, c, 32); S_R2(c, d, e, a, b, 33); S_R2(b, c, d, e, a, 34); S_R2(a, b, c, d, e, 35);
+        S_R2(e, a, b, c, d, 36); S_R2(d, e, a, b, c, 37); S_R2(c, d, e, a, b, 38); S_R2(b, c, d, e, a, 39);
+        S_R3(a, b, c, d, e, 40); S_R3(e, a, b, c, d, 41); S_R3(d, e, a, b, c, 42); S_R3(c, d, e, a, b, 43);
+        S_R3(b, c, d, e, a, 44); S_R3(a, b, c, d, e, 45); S_R3(e, a, b, c, d, 46); S_R3(d, e, a, b, c, 47);
+        S_R3(c, d, e, a, b, 48); S_R3(b, c, d, e, a, 49); S_R3(a, b, c, d, e, 50); S_R3(e, a, b, c, d, 51);
+        S_R3(d, e, a, b, c, 52); S_R3(c, d, e, a, b, 53); S_R3(b, c, d, e, a, 54); S_R3(a, b, c, d, e, 55);
+        S_R3(e, a, b, c, d, 56); S_R3(d, e, a, b, c, 57); S_R3(c, d, e, a, b, 58); S_R3(b, c, d, e, a, 59);
+        S_R4(a, b, c, d, e, 60); S_R4(e, a, b, c, d, 61); S_R4(d, e, a, b, c, 62); S_R4(c, d, e, a, b, 63);
+        S_R4(b, c, d, e, a, 64); S_R4(a, b, c, d, e, 65); S_R4(e, a, b, c, d, 66); S_R4(d, e, a, b, c, 67);
+        S_R4(c, d, e, a, b, 68); S_R4(b, c, d, e, a, 69); S_R4(a, b, c, d, e, 70); S_R4(e, a, b, c, d, 71);
+        S_R4(d, e, a, b, c, 72); S_R4(c, d, e, a, b, 73); S_R4(b, c, d, e, a, 74); S_R4(a, b, c, d, e, 75);
+        S_R4(e, a, b, c, d, 76); S_R4(d, e, a, b, c, 77); S_R4(c, d, e, a, b, 78); S_R4(b, c, d, e, a, 79);
+
+        // Add the working vars back into state
+        pState[0] += a;
+        pState[1] += b;
+        pState[2] += c;
+        pState[3] += d;
+        pState[4] += e;
+
+        // Wipe variables
+#ifdef SHA1_WIPE_VARIABLES
+        a = b = c = d = e = 0;
+#endif
+    }
+
+	// Member variables
+	UINT_32 m_state[5];
+	UINT_32 m_count[2];
+	UINT_32 m_reserved0[1]; // Memory alignment padding
+	UINT_8 m_buffer[64];
+	UINT_8 m_digest[20];
+	UINT_32 m_reserved1[3]; // Memory alignment padding
+
+	UINT_8 m_workspace[64];
+	SHA1_WORKSPACE_BLOCK* m_block; // SHA1 pointer to the byte array above
+};
+
+#endif // SHA1_H_A545E61D43E9404E8D736869AB3CBFE7
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/endian/Endian.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/endian/Endian.hpp
new file mode 100644
index 00000000..c797e83d
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/base/endian/Endian.hpp
@@ -0,0 +1,140 @@
+#pragma once
+
+#include <cstdint>
+#include <cassert>
+#include <cstring>
+#include <cstdbool>
+#include <cstring>
+
+#include <brynet/net/SocketLibTypes.hpp>
+
+#ifdef BRYNET_PLATFORM_LINUX
+#include <endian.h>
+#elif defined BRYNET_PLATFORM_DARWIN
+#include <sys/_endian.h>
+#endif
+
+namespace brynet { namespace base { namespace endian {
+
+    inline uint64_t  hl64ton(uint64_t   hostValue)
+    {
+        uint64_t   ret = 0;
+        uint32_t   high, low;
+
+        low = hostValue & 0xFFFFFFFF;
+        high = (hostValue >> 32) & 0xFFFFFFFF;
+        low = htonl(low);
+        high = htonl(high);
+        ret = low;
+        ret <<= 32;
+        ret |= high;
+
+        return   ret;
+    }
+
+    inline uint64_t  ntohl64(uint64_t   netValue)
+    {
+        uint64_t   ret = 0;
+        uint32_t   high, low;
+
+        low = netValue & 0xFFFFFFFF;
+        high = (netValue >> 32) & 0xFFFFFFFF;
+        low = ntohl(low);
+        high = ntohl(high);
+        ret = low;
+        ret <<= 32;
+        ret |= high;
+
+        return   ret;
+    }
+
+#ifdef BRYNET_PLATFORM_WINDOWS
+    inline uint64_t hostToNetwork64(uint64_t host64, bool convert = true)
+    {
+        return convert ? hl64ton(host64) : host64;
+    }
+    inline uint32_t hostToNetwork32(uint32_t host32, bool convert = true)
+    {
+        return convert ? htonl(host32) : host32;
+    }
+
+    inline uint16_t hostToNetwork16(uint16_t host16, bool convert = true)
+    {
+        return convert ? htons(host16) : host16;
+    }
+
+    inline uint64_t networkToHost64(uint64_t net64, bool convert = true)
+    {
+        return convert ? ntohl64(net64) : net64;
+    }
+
+    inline uint32_t networkToHost32(uint32_t net32, bool convert = true)
+    {
+        return convert ? ntohl(net32) : net32;
+    }
+
+    inline uint16_t networkToHost16(uint16_t net16, bool convert = true)
+    {
+        return convert ? ntohs(net16) : net16;
+    }
+#elif defined BRYNET_PLATFORM_LINUX
+    inline uint64_t hostToNetwork64(uint64_t host64, bool convert = true)
+    {
+        return convert ? htobe64(host64) : host64;
+    }
+    inline uint32_t hostToNetwork32(uint32_t host32, bool convert = true)
+    {
+        return convert ? htobe32(host32) : host32;
+    }
+
+    inline uint16_t hostToNetwork16(uint16_t host16, bool convert = true)
+    {
+        return convert ? htobe16(host16) : host16;
+    }
+
+    inline uint64_t networkToHost64(uint64_t net64, bool convert = true)
+    {
+        return convert ? be64toh(net64) : net64;
+    }
+
+    inline uint32_t networkToHost32(uint32_t net32, bool convert = true)
+    {
+        return convert ? be32toh(net32) : net32;
+    }
+
+    inline uint16_t networkToHost16(uint16_t net16, bool convert = true)
+    {
+        return convert ? be16toh(net16) : net16;
+    }
+#elif defined BRYNET_PLATFORM_DARWIN
+    inline uint64_t hostToNetwork64(uint64_t host64, bool convert = true)
+    {
+        return convert ? hl64ton(host64) : host64;
+    }
+    inline uint32_t hostToNetwork32(uint32_t host32, bool convert = true)
+    {
+        return convert ? htonl(host32) : host32;
+    }
+
+    inline uint16_t hostToNetwork16(uint16_t host16, bool convert = true)
+    {
+        return convert ? htons(host16) : host16;
+    }
+
+    inline uint64_t networkToHost64(uint64_t net64, bool convert = true)
+    {
+        return convert ? ntohl64(net64) : net64;
+    }
+
+    inline uint32_t networkToHost32(uint32_t net32, bool convert = true)
+    {
+        return convert ? ntohl(net32) : net32;
+    }
+
+    inline uint16_t networkToHost16(uint16_t net16, bool convert = true)
+    {
+        return convert ? ntohs(net16) : net16;
+    }
+#endif
+
+} } }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/AsyncConnector.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/AsyncConnector.hpp
new file mode 100644
index 00000000..8d7dd75d
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/AsyncConnector.hpp
@@ -0,0 +1,89 @@
+#pragma once
+
+#include <brynet/net/detail/ConnectorDetail.hpp>
+
+namespace brynet { namespace net {
+
+    class ConnectOption final
+    {
+    public:
+        using CompletedCallback = std::function<void(TcpSocket::Ptr)>;
+        using ProcessTcpSocketCallback = std::function<void(TcpSocket&)>;
+        using FailedCallback = std::function<void()>;
+        using ConnectOptionFunc = detail::ConnectOptionFunc;
+
+        static ConnectOptionFunc WithAddr(const std::string& ip, int port)
+        {
+            return [ip, port](detail::ConnectOptionsInfo& option) {
+                option.ip = ip;
+                option.port = port;
+            };
+        }
+        static ConnectOptionFunc WithTimeout(std::chrono::nanoseconds timeout)
+        {
+            return [timeout](detail::ConnectOptionsInfo& option) {
+                option.timeout = timeout;
+            };
+        }
+        static ConnectOptionFunc WithCompletedCallback(CompletedCallback callback)
+        {
+            return [callback](detail::ConnectOptionsInfo& option) {
+                option.completedCallback = callback;
+            };
+        }
+        static ConnectOptionFunc AddProcessTcpSocketCallback(ProcessTcpSocketCallback process)
+        {
+            return [process](detail::ConnectOptionsInfo& option) {
+                option.processCallbacks.push_back(process);
+            };
+        }
+        static ConnectOptionFunc WithFailedCallback(FailedCallback callback)
+        {
+            return [callback](detail::ConnectOptionsInfo& option) {
+                option.faledCallback = callback;
+            };
+        }
+
+        static std::chrono::nanoseconds ExtractTimeout(const std::vector<ConnectOptionFunc>& options)
+        {
+            detail::ConnectOptionsInfo option;
+            for (const auto& func : options)
+            {
+                func(option);
+            }
+            return option.timeout;
+        }
+    };
+
+    class AsyncConnector :  public detail::AsyncConnectorDetail, 
+                            public std::enable_shared_from_this<AsyncConnector>
+    {
+    public:
+        using Ptr = std::shared_ptr<AsyncConnector>;
+
+        void    startWorkerThread()
+        {
+            detail::AsyncConnectorDetail::startWorkerThread();
+        }
+
+        void    stopWorkerThread()
+        {
+            detail::AsyncConnectorDetail::stopWorkerThread();
+        }
+
+        void    asyncConnect(const std::vector<detail::ConnectOptionFunc>& options)
+        {
+            detail::AsyncConnectorDetail::asyncConnect(options);
+        }
+
+        static  Ptr Create()
+        {
+            class make_shared_enabler : public AsyncConnector {};
+            return std::make_shared<make_shared_enabler>();
+        }
+
+    private:
+        AsyncConnector() = default;
+    };
+
+} }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/Channel.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/Channel.hpp
new file mode 100644
index 00000000..979cd5f1
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/Channel.hpp
@@ -0,0 +1,20 @@
+#pragma once
+
+namespace brynet { namespace net {
+
+    class EventLoop;
+
+    class Channel
+    {
+    public:
+        virtual ~Channel() = default;
+
+    private:
+        virtual void    canSend() = 0;
+        virtual void    canRecv() = 0;
+        virtual void    onClose() = 0;
+
+        friend class EventLoop;
+    };
+
+} }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/CurrentThread.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/CurrentThread.hpp
new file mode 100644
index 00000000..b9773601
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/CurrentThread.hpp
@@ -0,0 +1,55 @@
+#pragma once
+
+#include <brynet/base/Platform.hpp>
+
+#ifdef BRYNET_PLATFORM_WINDOWS
+#include <winsock2.h>
+#include <Windows.h>
+#elif defined BRYNET_PLATFORM_LINUX
+#include <unistd.h>
+#include <sys/prctl.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+#include <linux/unistd.h>
+#elif defined BRYNET_PLATFORM_DARWIN
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+#endif
+
+namespace brynet { namespace net { namespace current_thread {
+
+#ifdef BRYNET_PLATFORM_WINDOWS
+    using THREAD_ID_TYPE = DWORD;
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+    using THREAD_ID_TYPE = int;
+#endif
+
+    static THREAD_ID_TYPE& tid()
+    {
+#ifdef BRYNET_PLATFORM_WINDOWS
+        static __declspec(thread) THREAD_ID_TYPE cachedTid = 0;
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+        static __thread THREAD_ID_TYPE cachedTid = 0;
+#endif
+
+        if (cachedTid == 0)
+        {
+#ifdef BRYNET_PLATFORM_WINDOWS
+            cachedTid = GetCurrentThreadId();
+#elif defined BRYNET_PLATFORM_LINUX
+            cachedTid = static_cast<pid_t>(::syscall(SYS_gettid));
+#elif defined BRYNET_PLATFORM_DARWIN
+            // warning: 'syscall' is deprecated: 
+            // first deprecated in macOS 10.12 - syscall(2) is unsupported; 
+            // please switch to a supported interface.
+            uint64_t tid64;
+            pthread_threadid_np(NULL, &tid64);
+            cachedTid = (pid_t)tid64;
+#endif
+        }
+
+        return cachedTid;
+    }
+
+} } }
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/EventLoop.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/EventLoop.hpp
new file mode 100644
index 00000000..012ee919
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/EventLoop.hpp
@@ -0,0 +1,444 @@
+#pragma once
+
+#include <cstdint>
+#include <functional>
+#include <vector>
+#include <mutex>
+#include <memory>
+#include <atomic>
+#include <unordered_map>
+#include <cassert>
+#include <algorithm>
+
+#include <brynet/base/Timer.hpp>
+#include <brynet/base/NonCopyable.hpp>
+#include <brynet/base/Noexcept.hpp>
+#include <brynet/net/SocketLibFunction.hpp>
+#include <brynet/net/CurrentThread.hpp>
+
+#include <brynet/net/Channel.hpp>
+#include <brynet/net/Socket.hpp>
+#include <brynet/net/Exception.hpp>
+#include <brynet/net/detail/WakeupChannel.hpp>
+
+namespace brynet { namespace net {
+
+    class Channel;
+    class TcpConnection;
+    using TcpConnectionPtr = std::shared_ptr<TcpConnection>;
+
+    class EventLoop : public brynet::base::NonCopyable
+    {
+    public:
+        using Ptr = std::shared_ptr<EventLoop>;
+        using UserFunctor = std::function<void(void)>;
+
+    public:
+        EventLoop()
+            BRYNET_NOEXCEPT
+            :
+#ifdef BRYNET_PLATFORM_WINDOWS
+            mIOCP(CreateIoCompletionPort(INVALID_HANDLE_VALUE, 0, 0, 1)),
+            mWakeupChannel(std::make_unique<detail::WakeupChannel>(mIOCP))
+#elif defined BRYNET_PLATFORM_LINUX
+            mEpollFd(epoll_create(1))
+#elif defined BRYNET_PLATFORM_DARWIN
+            mKqueueFd(kqueue())
+#endif
+        {
+#ifdef BRYNET_PLATFORM_WINDOWS
+            mPGetQueuedCompletionStatusEx = NULL;
+            auto kernel32_module = GetModuleHandleA("kernel32.dll");
+            if (kernel32_module != NULL) {
+                mPGetQueuedCompletionStatusEx = reinterpret_cast<sGetQueuedCompletionStatusEx>(GetProcAddress(
+                    kernel32_module,
+                    "GetQueuedCompletionStatusEx"));
+                FreeLibrary(kernel32_module);
+            }
+#elif defined BRYNET_PLATFORM_LINUX
+            auto eventfd = ::eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
+            mWakeupChannel.reset(new detail::WakeupChannel(eventfd));
+            linkChannel(eventfd, mWakeupChannel.get());
+#elif defined BRYNET_PLATFORM_DARWIN
+            const int NOTIFY_IDENT = 42; // Magic number we use for our filter ID.
+            mWakeupChannel.reset(new detail::WakeupChannel(mKqueueFd, NOTIFY_IDENT));
+            //Add user event
+            struct kevent ev;
+            EV_SET(&ev, NOTIFY_IDENT, EVFILT_USER, EV_ADD | EV_CLEAR, 0, 0, NULL);
+
+            struct timespec timeout = { 0, 0 };
+            kevent(mKqueueFd, &ev, 1, NULL, 0, &timeout);
+#endif
+
+            mIsAlreadyPostWakeup = false;
+            mIsInBlock = true;
+
+            reallocEventSize(1024);
+            mSelfThreadID = -1;
+            mTimer = std::make_shared<brynet::base::TimerMgr>();
+        }
+
+        virtual ~EventLoop() BRYNET_NOEXCEPT
+        {
+#ifdef BRYNET_PLATFORM_WINDOWS
+            CloseHandle(mIOCP);
+            mIOCP = INVALID_HANDLE_VALUE;
+#elif defined BRYNET_PLATFORM_LINUX
+            close(mEpollFd);
+            mEpollFd = -1;
+#elif defined BRYNET_PLATFORM_DARWIN
+            close(mKqueueFd);
+            mKqueueFd = -1;
+#endif
+        }
+
+        void                            loop(int64_t milliseconds)
+        {
+            tryInitThreadID();
+
+#ifndef NDEBUG
+            assert(isInLoopThread());
+#endif
+            if (!isInLoopThread())
+            {
+                throw BrynetCommonException("only loop in io thread");
+            }
+
+            if (!mAfterLoopFunctors.empty())
+            {
+                milliseconds = 0;
+            }
+
+#ifdef BRYNET_PLATFORM_WINDOWS
+            ULONG numComplete = 0;
+            if (mPGetQueuedCompletionStatusEx != nullptr)
+            {
+                if (!mPGetQueuedCompletionStatusEx(mIOCP,
+                    mEventEntries.data(),
+                    static_cast<ULONG>(mEventEntries.size()),
+                    &numComplete,
+                    static_cast<DWORD>(milliseconds),
+                    false))
+                {
+                    numComplete = 0;
+                }
+            }
+            else
+            {
+                for (auto& e : mEventEntries)
+                {
+                    const auto timeout = (numComplete == 0) ? static_cast<DWORD>(milliseconds) : 0;
+                    /* don't check the return value of GQCS */
+                    GetQueuedCompletionStatus(mIOCP,
+                        &e.dwNumberOfBytesTransferred,
+                        &e.lpCompletionKey,
+                        &e.lpOverlapped,
+                        timeout);
+                    if (e.lpOverlapped == nullptr)
+                    {
+                        break;
+                    }
+                    ++numComplete;
+                }
+            }
+
+            mIsInBlock = false;
+
+            for (ULONG i = 0; i < numComplete; ++i)
+            {
+                auto channel = (Channel*)mEventEntries[i].lpCompletionKey;
+                assert(channel != nullptr);
+                const auto ovl = reinterpret_cast<const port::Win::OverlappedExt*>(mEventEntries[i].lpOverlapped);
+                if (ovl->OP == port::Win::OverlappedType::OverlappedRecv)
+                {
+                    channel->canRecv();
+                }
+                else if (ovl->OP == port::Win::OverlappedType::OverlappedSend)
+                {
+                    channel->canSend();
+                }
+                else
+                {
+                    assert(false);
+                }
+            }
+#elif defined BRYNET_PLATFORM_LINUX
+            int numComplete = epoll_wait(mEpollFd, mEventEntries.data(), mEventEntries.size(), milliseconds);
+
+            mIsInBlock = false;
+
+            for (int i = 0; i < numComplete; ++i)
+            {
+                auto    channel = (Channel*)(mEventEntries[i].data.ptr);
+                auto    event_data = mEventEntries[i].events;
+
+                if (event_data & EPOLLRDHUP)
+                {
+                    channel->canRecv();
+                    channel->onClose();
+                    continue;
+                }
+
+                if (event_data & EPOLLIN)
+                {
+                    channel->canRecv();
+                }
+
+                if (event_data & EPOLLOUT)
+                {
+                    channel->canSend();
+                }
+            }
+#elif defined BRYNET_PLATFORM_DARWIN
+            struct timespec timeout = { milliseconds / 1000, (milliseconds % 1000) * 1000 * 1000 };
+            int numComplete = kevent(mKqueueFd, NULL, 0, mEventEntries.data(), mEventEntries.size(), &timeout);
+
+            mIsInBlock = false;
+
+            for (int i = 0; i < numComplete; ++i)
+            {
+                auto channel = (Channel*)(mEventEntries[i].udata);
+                const struct kevent& event = mEventEntries[i];
+
+                if (event.filter == EVFILT_USER)
+                {
+                    continue;
+                }
+
+                if (event.filter == EVFILT_READ)
+                {
+                    channel->canRecv();
+                }
+
+                if (event.filter == EVFILT_WRITE)
+                {
+                    channel->canSend();
+                }
+            }
+#endif
+
+            mIsAlreadyPostWakeup = false;
+            mIsInBlock = true;
+
+            processAsyncFunctors();
+            processAfterLoopFunctors();
+
+            if (static_cast<size_t>(numComplete) == mEventEntries.size())
+            {
+                reallocEventSize(mEventEntries.size() + 128);
+            }
+
+            mTimer->schedule();
+        }
+
+        // loop指定毫秒数,但如果定时器�为空,则loop时间为当�最近定时器的剩余时间和milliseconds的较�值
+        void                            loopCompareNearTimer(int64_t milliseconds)
+        {
+            tryInitThreadID();
+
+#ifndef NDEBUG
+            assert(isInLoopThread());
+#endif
+            if (!isInLoopThread())
+            {
+                throw BrynetCommonException("only loop in IO thread");
+            }
+
+            if (!mTimer->isEmpty())
+            {
+                auto nearTimeout = std::chrono::duration_cast<std::chrono::milliseconds>(mTimer->nearLeftTime());
+                milliseconds = std::min<int64_t>(milliseconds, nearTimeout.count());
+            }
+
+            loop(milliseconds);
+        }
+
+        // 返回true表示实际�生了wakeup所需的�作(此返回值�代表接�本身�作�功与�,因为此函数永远�功)
+        bool                            wakeup()
+        {
+            if (!isInLoopThread() && mIsInBlock && !mIsAlreadyPostWakeup.exchange(true))
+            {
+                return mWakeupChannel->wakeup();
+            }
+
+            return false;
+        }
+
+        void                            runAsyncFunctor(UserFunctor&& f)
+        {
+            if (isInLoopThread())
+            {
+                f();
+            }
+            else
+            {
+                pushAsyncFunctor(std::move(f));
+                wakeup();
+            }
+        }
+        void                            runFunctorAfterLoop(UserFunctor&& f)
+        {
+            assert(isInLoopThread());
+            if (!isInLoopThread())
+            {
+                throw BrynetCommonException("only push after functor in io thread");
+            }
+
+            mAfterLoopFunctors.emplace_back(std::move(f));
+        }
+        brynet::base::Timer::WeakPtr   runAfter(std::chrono::nanoseconds timeout, UserFunctor&& callback)
+        {
+            auto timer = std::make_shared<brynet::base::Timer>(
+                std::chrono::steady_clock::now(),
+                std::chrono::nanoseconds(timeout),
+                std::move(callback));
+
+            if (isInLoopThread())
+            {
+                mTimer->addTimer(timer);
+            }
+            else
+            {
+                auto timerMgr = mTimer;
+                runAsyncFunctor([timerMgr, timer]() {
+                    timerMgr->addTimer(timer);
+                    });
+            }
+
+            return timer;
+        }
+
+        inline bool                     isInLoopThread() const
+        {
+            return mSelfThreadID == current_thread::tid();
+        }
+
+    private:
+        void                            reallocEventSize(size_t size)
+        {
+            mEventEntries.resize(size);
+        }
+
+        void                            processAfterLoopFunctors()
+        {
+            mCopyAfterLoopFunctors.swap(mAfterLoopFunctors);
+            for (const auto& x : mCopyAfterLoopFunctors)
+            {
+                x();
+            }
+            mCopyAfterLoopFunctors.clear();
+        }
+        void                            processAsyncFunctors()
+        {
+            swapAsyncFunctors();
+
+            for (const auto& x : mCopyAsyncFunctors)
+            {
+                x();
+            }
+            mCopyAsyncFunctors.clear();
+        }
+        void                            swapAsyncFunctors()
+        {
+            std::lock_guard<std::mutex> lck(mAsyncFunctorsMutex);
+            assert(mCopyAsyncFunctors.empty());
+            mCopyAsyncFunctors.swap(mAsyncFunctors);
+        }
+        void                            pushAsyncFunctor(UserFunctor&& f)
+        {
+            std::lock_guard<std::mutex> lck(mAsyncFunctorsMutex);
+            mAsyncFunctors.emplace_back(std::move(f));
+        }
+
+#ifdef BRYNET_PLATFORM_LINUX
+        int                             getEpollHandle() const
+        {
+            return mEpollFd;
+        }
+#elif defined BRYNET_PLATFORM_DARWIN
+        int                             getKqueueHandle() const
+        {
+            return mKqueueFd;
+        }
+#endif
+        bool                            linkChannel(BrynetSocketFD fd, const Channel* ptr) BRYNET_NOEXCEPT
+        {
+#ifdef BRYNET_PLATFORM_WINDOWS
+            return CreateIoCompletionPort((HANDLE)fd, mIOCP, (ULONG_PTR)ptr, 0) != nullptr;
+#elif defined BRYNET_PLATFORM_LINUX
+            struct epoll_event ev = { 0, { nullptr } };
+            ev.events = EPOLLET | EPOLLIN | EPOLLOUT | EPOLLRDHUP;
+            ev.data.ptr = (void*)ptr;
+            return epoll_ctl(mEpollFd, EPOLL_CTL_ADD, fd, &ev) == 0;
+#elif defined BRYNET_PLATFORM_DARWIN
+            struct kevent ev[2];
+            memset(&ev, 0, sizeof(ev));
+            int n = 0;
+            EV_SET(&ev[n++], fd, EVFILT_READ, EV_ADD | EV_CLEAR, NOTE_TRIGGER, 0, (void*)ptr);
+            EV_SET(&ev[n++], fd, EVFILT_WRITE, EV_ADD | EV_CLEAR, NOTE_TRIGGER, 0, (void*)ptr);
+
+            struct timespec now = { 0, 0 };
+            return kevent(mKqueueFd, ev, n, NULL, 0, &now) == 0;
+#endif
+        }
+        TcpConnectionPtr                getTcpConnection(BrynetSocketFD fd)
+        {
+            auto it = mTcpConnections.find(fd);
+            if (it != mTcpConnections.end())
+            {
+                return (*it).second;
+            }
+            return nullptr;
+        }
+        void                            addTcpConnection(BrynetSocketFD fd, TcpConnectionPtr tcpConnection)
+        {
+            mTcpConnections[fd] = std::move(tcpConnection);
+        }
+        void                            removeTcpConnection(BrynetSocketFD fd)
+        {
+            mTcpConnections.erase(fd);
+        }
+        void                            tryInitThreadID()
+        {
+            std::call_once(mOnceInitThreadID, [this]() {
+                mSelfThreadID = current_thread::tid();
+                });
+        }
+
+    private:
+
+#ifdef BRYNET_PLATFORM_WINDOWS
+        std::vector<OVERLAPPED_ENTRY>   mEventEntries;
+
+        typedef BOOL(WINAPI *sGetQueuedCompletionStatusEx) (HANDLE, LPOVERLAPPED_ENTRY, ULONG, PULONG, DWORD, BOOL);
+        sGetQueuedCompletionStatusEx    mPGetQueuedCompletionStatusEx;
+        HANDLE                          mIOCP;
+#elif defined BRYNET_PLATFORM_LINUX
+        std::vector<epoll_event>        mEventEntries;
+        int                             mEpollFd;
+#elif defined BRYNET_PLATFORM_DARWIN
+        std::vector<struct kevent>      mEventEntries;
+        int                             mKqueueFd;
+#endif
+        std::unique_ptr<detail::WakeupChannel>  mWakeupChannel;
+
+        std::atomic_bool                mIsInBlock;
+        std::atomic_bool                mIsAlreadyPostWakeup;
+
+        std::mutex                      mAsyncFunctorsMutex;
+        std::vector<UserFunctor>        mAsyncFunctors;
+        std::vector<UserFunctor>        mCopyAsyncFunctors;
+
+        std::vector<UserFunctor>        mAfterLoopFunctors;
+        std::vector<UserFunctor>        mCopyAfterLoopFunctors;
+
+        std::once_flag                  mOnceInitThreadID;
+        current_thread::THREAD_ID_TYPE  mSelfThreadID;
+
+        brynet::base::TimerMgr::Ptr    mTimer;
+        std::unordered_map<BrynetSocketFD, TcpConnectionPtr> mTcpConnections;
+
+        friend class TcpConnection;
+    };
+
+} }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/Exception.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/Exception.hpp
new file mode 100644
index 00000000..2fa103b4
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/Exception.hpp
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <string>
+#include <exception>
+#include <stdexcept>
+
+namespace brynet { namespace net {
+
+    class ConnectException : public std::runtime_error
+    {
+    public:
+        explicit ConnectException(const std::string& message)
+            :
+            std::runtime_error(message)
+        {
+        }
+
+        explicit ConnectException(const char* message)
+            :
+            std::runtime_error(message)
+        {
+        }
+    };
+
+    class BrynetCommonException : public std::runtime_error
+    {
+    public:
+        explicit BrynetCommonException(const std::string& message)
+            :
+            std::runtime_error(message)
+        {
+        }
+
+        explicit BrynetCommonException(const char* message)
+            :
+            std::runtime_error(message)
+        {
+        }
+    };
+
+} }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/ListenThread.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/ListenThread.hpp
new file mode 100644
index 00000000..3b9ef908
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/ListenThread.hpp
@@ -0,0 +1,58 @@
+#pragma once
+
+#include <brynet/net/detail/ListenThreadDetail.hpp>
+
+namespace brynet { namespace net {
+
+    class ListenThread :    public detail::ListenThreadDetail, 
+                            public std::enable_shared_from_this<ListenThread>
+    {
+    public:
+        using Ptr = std::shared_ptr<ListenThread>;
+        using AccepCallback = std::function<void(TcpSocket::Ptr)>;;
+        using TcpSocketProcessCallback = std::function<void(TcpSocket&)>;
+
+        void    startListen()
+        {
+            detail::ListenThreadDetail::startListen();
+        }
+
+        void    stopListen()
+        {
+            detail::ListenThreadDetail::stopListen();
+        }
+
+    public:
+        static  Ptr     Create(bool isIPV6,
+            const std::string& ip,
+            int port,
+            const AccepCallback& callback,
+            const std::vector<TcpSocketProcessCallback> & processCallbacks = {})
+        {
+            class make_shared_enabler : public ListenThread
+            {
+            public:
+                make_shared_enabler(bool isIPV6,
+                    const std::string& ip,
+                    int port,
+                    const AccepCallback& callback,
+                    const std::vector<TcpSocketProcessCallback>& processCallbacks)
+                    :
+                    ListenThread(isIPV6, ip, port, callback, processCallbacks)
+                {}
+            };
+            return std::make_shared<make_shared_enabler>(isIPV6, ip, port, callback, processCallbacks);
+        }
+
+    protected:
+        ListenThread(bool isIPV6,
+            const std::string& ip,
+            int port,
+            const AccepCallback& callback,
+            const std::vector<TcpSocketProcessCallback>& processCallbacks)
+            :
+            detail::ListenThreadDetail(isIPV6, ip, port, callback, processCallbacks)
+        {}
+    };
+
+} }
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/Poller.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/Poller.hpp
new file mode 100644
index 00000000..820a9410
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/Poller.hpp
@@ -0,0 +1,266 @@
+#pragma once
+
+#include <cstdlib>
+#include <cstdio>
+#include <cassert>
+#include <cstdbool>
+#include <string>
+
+#include <brynet/net/SocketLibTypes.hpp>
+#include <brynet/base/Stack.hpp>
+
+#if defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+#include <poll.h>
+#endif
+
+namespace brynet { namespace base {
+
+    #ifdef BRYNET_PLATFORM_WINDOWS
+    const static int CHECK_READ_FLAG = (POLLIN | POLLRDNORM | POLLRDBAND);
+    const static int CHECK_WRITE_FLAG = (POLLOUT | POLLWRNORM);
+    const static int CHECK_ERROR_FLAG = (POLLERR | POLLHUP);
+    #elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+    const static int CHECK_READ_FLAG = (POLLIN | POLLRDNORM | POLLRDBAND | POLLPRI);
+    const static int CHECK_WRITE_FLAG = (POLLOUT | POLLWRNORM | POLLWRBAND);
+    const static int CHECK_ERROR_FLAG = (POLLERR | POLLHUP);
+    #endif
+
+    enum CheckType
+    {
+        ReadCheck = 0x1,
+        WriteCheck = 0x2,
+        ErrorCheck = 0x4,
+    };
+
+    struct poller_s
+    {
+        struct pollfd* pollFds;
+        int nfds;
+        int limitSize;
+    };
+
+    static void upstep_pollfd(struct poller_s* self, int upSize)
+    {
+        if (upSize <= 0)
+        {
+            return;
+        }
+
+        struct pollfd* newPollfds = (struct pollfd*)malloc(
+            sizeof(struct pollfd) * (self->limitSize + upSize));
+        if (newPollfds == nullptr)
+        {
+            return;
+        }
+
+        if (self->pollFds != nullptr)
+        {
+            memcpy(newPollfds, self->pollFds, sizeof(struct pollfd) * self->nfds);
+            free(self->pollFds);
+            self->pollFds = nullptr;
+        }
+        self->pollFds = newPollfds;
+        self->limitSize += upSize;
+    }
+
+    static struct pollfd* find_pollfd(struct poller_s* self, BrynetSocketFD fd)
+    {
+        for (int i = 0; i < self->nfds; i++)
+        {
+            if (self->pollFds[i].fd == fd)
+            {
+                return self->pollFds + i;
+            }
+        }
+
+        return nullptr;
+    }
+
+    static void try_remove_pollfd(struct poller_s* self, BrynetSocketFD fd)
+    {
+        int pos = -1;
+        for (int i = 0; i < self->nfds; i++)
+        {
+            if (self->pollFds[i].fd == fd)
+            {
+                pos = i;
+                break;
+            }
+        }
+
+        if (pos != -1)
+        {
+            memmove(self->pollFds + pos, 
+                self->pollFds + pos + 1, 
+                sizeof(struct pollfd) * (self->nfds - pos - 1));
+            self->nfds--;
+            assert(self->nfds >= 0);
+        }
+    }
+
+    static struct poller_s* poller_new(void)
+    {
+        struct poller_s* ret = (struct poller_s*)malloc(sizeof(struct poller_s));
+        if (ret != nullptr)
+        {
+            ret->pollFds = NULL;
+            ret->limitSize = 0;
+            ret->nfds = 0;
+            upstep_pollfd(ret, 1024);
+        }
+
+        return ret;
+    }
+
+    static void poller_delete(struct poller_s* self)
+    {
+        free(self->pollFds);
+        self->pollFds = nullptr;
+        self->nfds = 0;
+        self->limitSize = 0;
+
+        free(self);
+        self = nullptr;
+    }
+
+    static void poller_add(struct poller_s* self, BrynetSocketFD fd, int type)
+    {
+        if (self->limitSize == self->nfds)
+        {
+            upstep_pollfd(self, 128);
+        }
+
+        if (self->limitSize <= self->nfds)
+        {
+            return;
+        }
+
+        struct pollfd* pf = find_pollfd(self, fd);
+        if (pf == nullptr)
+        {
+            /*real add*/
+            pf = self->pollFds + self->nfds;
+            pf->events = 0;
+            pf->fd = fd;
+
+            self->nfds++;
+        }
+
+        if (type & ReadCheck)
+        {
+            pf->events |= CHECK_READ_FLAG;
+        }
+
+        if (type & WriteCheck)
+        {
+            pf->events |= CHECK_WRITE_FLAG;
+        }
+
+        if (type & ErrorCheck)
+        {
+            //pf->events |= CHECK_ERROR_FLAG;   TODO::on windows, not supports
+        }
+    }
+
+    static void poller_del(struct poller_s* self, BrynetSocketFD fd, int type)
+    {
+        struct pollfd* pf = find_pollfd(self, fd);
+        if (pf == nullptr)
+        {
+            return;
+        }
+
+        if (type & ReadCheck)
+        {
+            pf->events &= ~CHECK_READ_FLAG;
+        }
+
+        if (type & WriteCheck)
+        {
+            pf->events &= ~CHECK_WRITE_FLAG;
+        }
+
+        if (type & ErrorCheck)
+        {
+            pf->events &= ~CHECK_ERROR_FLAG;
+        }
+
+        if (pf->events == 0)
+        {
+            try_remove_pollfd(self, fd);
+        }
+    }
+
+    static void poller_remove(struct poller_s* self, BrynetSocketFD fd)
+    {
+        try_remove_pollfd(self, fd);
+    }
+
+    static bool check_event(const struct pollfd* pf, enum CheckType type)
+    {
+        if (pf == nullptr)
+        {
+            return false;
+        }
+
+        if ((type & ReadCheck) &&
+            (pf->revents & CHECK_READ_FLAG))
+        {
+            return true;
+        }
+        else if ((type & WriteCheck) &&
+            (pf->revents & CHECK_WRITE_FLAG))
+        {
+            return true;
+        }
+        else if ((type & ErrorCheck) &&
+            (pf->revents & CHECK_ERROR_FLAG))
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    static void poller_visitor(struct poller_s* self, 
+        enum CheckType type, 
+        struct stack_s* result)
+    {
+        for (int i = 0; i < self->nfds; i++)
+        {
+            if (check_event(self->pollFds + i, type))
+            {
+                stack_push(result, &self->pollFds[i].fd);
+            }
+        }
+    }
+
+    static int poller_poll(struct poller_s* self, long overtime)
+    {
+#ifdef BRYNET_PLATFORM_WINDOWS
+        int ret = WSAPoll(&self->pollFds[0], self->nfds, overtime);
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+        int ret = poll(self->pollFds, self->nfds, overtime);
+#endif
+
+        if (ret == BRYNET_SOCKET_ERROR)
+        {
+            ret = (BRYNET_ERRNO != BRYNET_EINTR) ? -1 : 0;
+        }
+
+        return ret;
+    }
+
+    static bool poller_check(struct poller_s* self, BrynetSocketFD fd, enum CheckType type)
+    {
+        const struct pollfd* pf = find_pollfd(self, fd);
+        if (pf == NULL)
+        {
+            return false;
+        }
+        return check_event(pf, type);
+    }
+
+} }
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/PromiseReceive.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/PromiseReceive.hpp
new file mode 100644
index 00000000..b1c02110
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/PromiseReceive.hpp
@@ -0,0 +1,155 @@
+#pragma once
+
+#include <brynet/net/TcpService.hpp>
+
+namespace brynet { namespace net {
+
+    /* binary search in memory */
+    void memsearch(const char *hay, size_t haysize, const char *needle, size_t needlesize, size_t& result, bool& isOK)
+    {
+        size_t haypos, needlepos;
+        haysize -= needlesize;
+
+        for (haypos = 0; haypos <= haysize; haypos++)
+        {
+            for (needlepos = 0; needlepos < needlesize; needlepos++)
+            {
+                if (hay[haypos + needlepos] != needle[needlepos])
+                {
+                    // Next character in haystack.
+                    break;
+                }
+            }
+            if (needlepos == needlesize)
+            {
+                result = haypos;
+                isOK = true;
+                return;
+            }
+        }
+
+        isOK = false;
+    }
+
+    class PromiseReceive;
+
+    std::shared_ptr<PromiseReceive> setupPromiseReceive(const TcpConnection::Ptr& session);
+
+    class PromiseReceive : public std::enable_shared_from_this<PromiseReceive>
+    {
+    public:
+        using Ptr = std::shared_ptr<PromiseReceive>;
+        using Handle = std::function<bool(const char* buffer, size_t len)>;
+
+        PromiseReceive::Ptr receive(size_t len, Handle handle)
+        {
+            return receive(std::make_shared<size_t>(len), std::move(handle));
+        }
+
+        PromiseReceive::Ptr receive(std::shared_ptr<size_t> len, Handle handle)
+        {
+            return helpReceive(std::move(len), "", std::move(handle));
+        }
+
+        PromiseReceive::Ptr receiveUntil(std::string str, Handle handle)
+        {
+            if (str.empty())
+            {
+                throw std::runtime_error("str is empty");
+            }
+
+            return helpReceive(nullptr, std::move(str), std::move(handle));
+        }
+
+    private:
+        PromiseReceive::Ptr helpReceive(std::shared_ptr<size_t> len, std::string str, Handle handle)
+        {
+            auto pr = std::make_shared<PendingReceive>();
+            pr->len = std::move(len);
+            pr->str = std::move(str);
+            pr->handle = std::move(handle);
+            mPendingReceives.push_back(std::move(pr));
+
+            return shared_from_this();
+        }
+
+        size_t process(const char* buffer, const size_t len)
+        {
+            size_t procLen = 0;
+
+            while (!mPendingReceives.empty() && len >= procLen)
+            {
+                auto pendingReceive = mPendingReceives.front();
+                if (pendingReceive->len != nullptr)
+                {
+                    const auto tryReceiveLen = *pendingReceive->len;
+                    if ((len - procLen) < tryReceiveLen)
+                    {
+                        break;
+                    }
+
+                    mPendingReceives.pop_front();
+                    procLen += tryReceiveLen;
+                    if (pendingReceive->handle(buffer + procLen - tryReceiveLen, tryReceiveLen) && tryReceiveLen > 0)
+                    {
+                        mPendingReceives.push_front(pendingReceive);
+                    }
+                }
+                else if (!pendingReceive->str.empty())
+                {
+                    size_t pos = 0;
+                    bool isOK = false;
+                    auto data = buffer + procLen;
+                    memsearch(buffer + procLen,
+                        len - procLen,
+                        pendingReceive->str.c_str(),
+                        pendingReceive->str.size(),
+                        pos,
+                        isOK);
+
+                    if (!isOK)
+                    {
+                        break;
+                    }
+
+                    mPendingReceives.pop_front();
+                    procLen += (pos + pendingReceive->str.size());
+                    if (pendingReceive->handle(data, pos))
+                    {
+                        mPendingReceives.push_front(pendingReceive);
+                    }
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            return procLen;
+        }
+
+    private:
+        struct PendingReceive
+        {
+            std::shared_ptr<size_t> len;
+            std::string str;
+            Handle handle;
+        };
+
+        std::deque<std::shared_ptr<PendingReceive>> mPendingReceives;
+
+        friend std::shared_ptr<PromiseReceive> setupPromiseReceive(const TcpConnection::Ptr& session);
+    };
+
+    std::shared_ptr<PromiseReceive> setupPromiseReceive(const TcpConnection::Ptr& session)
+    {
+        auto promiseReceive = std::make_shared<PromiseReceive>();
+        session->setDataCallback([promiseReceive](const char* buffer,
+            size_t len) {
+            return promiseReceive->process(buffer, len);
+        });
+
+        return promiseReceive;
+    }
+
+} }
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/SSLHelper.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/SSLHelper.hpp
new file mode 100644
index 00000000..fb2598d7
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/SSLHelper.hpp
@@ -0,0 +1,174 @@
+#pragma once
+
+#include <string>
+#include <memory>
+#include <unordered_map>
+#include <mutex>
+#include <thread>
+
+#include <brynet/base/NonCopyable.hpp>
+#include <brynet/base/Platform.hpp>
+#include <brynet/base/Noexcept.hpp>
+
+#ifdef BRYNET_USE_OPENSSL
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
+
+namespace brynet { namespace net {
+
+#ifdef BRYNET_USE_OPENSSL
+
+#ifndef CRYPTO_THREADID_set_callback
+    static void cryptoSetThreadIDCallback(CRYPTO_THREADID* id)
+    {
+#ifdef BRYNET_PLATFORM_WINDOWS
+        CRYPTO_THREADID_set_numeric(id, 
+            static_cast<unsigned long>(GetCurrentThreadId()));
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+        CRYPTO_THREADID_set_numeric(id, 
+            static_cast<unsigned long>(pthread_self()));
+#endif
+    }
+#endif
+
+#ifndef CRYPTO_set_locking_callback
+    static std::unordered_map<int, std::shared_ptr<std::mutex>> cryptoLocks;
+    static void cryptoLockingCallback(int mode,
+        int type,
+        const char* file, int line)
+    {
+        (void)file;
+        (void)line;
+        if (mode & CRYPTO_LOCK)
+        {
+            cryptoLocks[type]->lock();
+        }
+        else if (mode & CRYPTO_UNLOCK)
+        {
+            cryptoLocks[type]->unlock();
+        }
+    }
+#endif
+
+    static std::once_flag initCryptoThreadSafeSupportOnceFlag;
+    static void InitCryptoThreadSafeSupport()
+    {
+#ifndef CRYPTO_THREADID_set_callback
+        CRYPTO_THREADID_set_callback(cryptoSetThreadIDCallback);
+#endif
+
+#ifndef CRYPTO_set_locking_callback
+        for (int i = 0; i < CRYPTO_num_locks(); i++)
+        {
+            cryptoLocks[i] = std::make_shared<std::mutex>();
+        }
+        CRYPTO_set_locking_callback(cryptoLockingCallback);
+#endif
+    }
+#endif
+
+    class SSLHelper :   public brynet::base::NonCopyable, 
+                        public std::enable_shared_from_this<SSLHelper>
+    {
+    public:
+        using Ptr = std::shared_ptr<SSLHelper>;
+
+#ifdef BRYNET_USE_OPENSSL
+        bool        initSSL(const std::string& certificate,
+            const std::string& privatekey)
+        {
+            std::call_once(initCryptoThreadSafeSupportOnceFlag, 
+                InitCryptoThreadSafeSupport);
+
+            if (mOpenSSLCTX != nullptr)
+            {
+                return false;
+            }
+            if (certificate.empty() || privatekey.empty())
+            {
+                return false;
+            }
+
+            mOpenSSLCTX = SSL_CTX_new(SSLv23_method());
+            SSL_CTX_set_client_CA_list(mOpenSSLCTX, 
+                SSL_load_client_CA_file(certificate.c_str()));
+            SSL_CTX_set_verify_depth(mOpenSSLCTX, 10);
+
+            if (SSL_CTX_use_certificate_chain_file(mOpenSSLCTX, 
+                certificate.c_str()) <= 0)
+            {
+                SSL_CTX_free(mOpenSSLCTX);
+                mOpenSSLCTX = nullptr;
+                return false;
+            }
+
+            if (SSL_CTX_use_PrivateKey_file(mOpenSSLCTX, 
+                privatekey.c_str(), 
+                SSL_FILETYPE_PEM) <= 0)
+            {
+                SSL_CTX_free(mOpenSSLCTX);
+                mOpenSSLCTX = nullptr;
+                return false;
+            }
+
+            if (!SSL_CTX_check_private_key(mOpenSSLCTX))
+            {
+                SSL_CTX_free(mOpenSSLCTX);
+                mOpenSSLCTX = nullptr;
+                return false;
+            }
+
+            return true;
+        }
+
+        void        destroySSL()
+        {
+            if (mOpenSSLCTX != nullptr)
+            {
+                SSL_CTX_free(mOpenSSLCTX);
+                mOpenSSLCTX = nullptr;
+            }
+        }
+
+        SSL_CTX* getOpenSSLCTX()
+        {
+            return mOpenSSLCTX;
+        }
+#endif
+        static  Ptr Create()
+        {
+            class make_shared_enabler : public SSLHelper {};
+            return std::make_shared<make_shared_enabler>();
+        }
+
+    protected:
+        SSLHelper() BRYNET_NOEXCEPT
+        {
+#ifdef BRYNET_USE_OPENSSL
+            mOpenSSLCTX = nullptr;
+#endif
+        }
+
+        virtual ~SSLHelper() BRYNET_NOEXCEPT
+        {
+#ifdef BRYNET_USE_OPENSSL
+            destroySSL();
+#endif
+        }
+
+    private:
+#ifdef BRYNET_USE_OPENSSL
+        SSL_CTX*        mOpenSSLCTX;
+#endif
+    };
+
+} }
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/Socket.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/Socket.hpp
new file mode 100644
index 00000000..738f5079
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/Socket.hpp
@@ -0,0 +1,230 @@
+#pragma once
+
+#include <memory>
+#include <string>
+#include <exception>
+#include <stdexcept>
+
+#include <brynet/base/NonCopyable.hpp>
+#include <brynet/net/SocketLibFunction.hpp>
+
+namespace brynet { namespace net {
+
+    class TcpConnection;
+
+    class UniqueFd final : public brynet::base::NonCopyable
+    {
+    public:
+        explicit UniqueFd(BrynetSocketFD fd)
+            :
+            mFD(fd)
+        {}
+
+        ~UniqueFd()
+        {
+            brynet::net::base::SocketClose(mFD);
+        }
+
+        UniqueFd(const UniqueFd& other) = delete;
+        UniqueFd& operator=(const UniqueFd& other) = delete;
+
+        BrynetSocketFD    getFD() const
+        {
+            return mFD;
+        }
+
+    private:
+        BrynetSocketFD    mFD;
+    };
+
+    class TcpSocket : public brynet::base::NonCopyable
+    {
+    private:
+        class TcpSocketDeleter
+        {
+        public:
+            void operator()(TcpSocket* ptr) const
+            {
+                delete ptr;
+            }
+        };
+    public:
+        using Ptr = std::unique_ptr<TcpSocket, TcpSocketDeleter>;
+
+    public:
+        static Ptr Create(BrynetSocketFD fd, bool serverSide)
+        {
+            class make_unique_enabler : public TcpSocket
+            {
+            public:
+                make_unique_enabler(BrynetSocketFD fd, bool serverSide)
+                    :
+                    TcpSocket(fd, serverSide)
+                    {}
+            };
+
+            return Ptr(new make_unique_enabler(fd, serverSide));
+        }
+
+    public:
+        void            setNodelay() const
+        {
+            brynet::net::base::SocketNodelay(mFD);
+        }
+
+        bool            setNonblock() const
+        {
+            return brynet::net::base::SocketNonblock(mFD);
+        }
+
+        void            setSendSize(int sdSize) const
+        {
+            brynet::net::base::SocketSetSendSize(mFD, sdSize);
+        }
+
+        void            setRecvSize(int rdSize) const
+        {
+            brynet::net::base::SocketSetRecvSize(mFD, rdSize);
+        }
+
+        std::string     getRemoteIP() const
+        {
+            return brynet::net::base::GetIPOfSocket(mFD);
+        }
+
+        bool            isServerSide() const
+        {
+            return mServerSide;
+        }
+
+    protected:
+        TcpSocket(BrynetSocketFD fd, bool serverSide)
+            :
+            mFD(fd),
+            mServerSide(serverSide)
+        {
+        }
+
+        virtual ~TcpSocket()
+        {
+            brynet::net::base::SocketClose(mFD);
+        }
+
+        BrynetSocketFD    getFD() const
+        {
+            return mFD;
+        }
+
+    private:
+        const BrynetSocketFD  mFD;
+        const bool      mServerSide;
+
+        friend class TcpConnection;
+    };
+
+    class EintrError : public std::exception
+    {
+    };
+
+    class AcceptError : public std::runtime_error
+    {
+    public:
+        explicit AcceptError(int errorCode)
+            :
+            std::runtime_error(std::to_string(errorCode)),
+            mErrorCode(errorCode)
+        {}
+
+        int getErrorCode() const
+        {
+            return mErrorCode;
+        }
+
+    private:
+        int mErrorCode;
+    };
+
+    class ListenSocket : public brynet::base::NonCopyable
+    {
+    private:
+        class ListenSocketDeleter
+        {
+        public:
+            void operator()(ListenSocket* ptr) const
+            {
+                delete ptr;
+            }
+        };
+    public:
+        using Ptr = std::unique_ptr<ListenSocket, ListenSocketDeleter>;
+
+    public:
+        TcpSocket::Ptr accept()
+        {
+            const auto clientFD = brynet::net::base::Accept(mFD, nullptr, nullptr);
+            if (clientFD == BRYNET_INVALID_SOCKET)
+            {
+#if defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+                if (BRYNET_ERRNO == EMFILE)
+                {
+                    // Thanks libev and muduo.
+                    // Read the section named "The special problem of
+                    // accept()ing when you can't" in libev's doc.
+                    // By Marc Lehmann, author of libev.
+                    mIdle.reset();
+                    TcpSocket::Create(brynet::net::base::Accept(mFD, nullptr, nullptr), true);
+                    mIdle = brynet::net::TcpSocket::Create(::open("/dev/null", O_RDONLY | O_CLOEXEC), true);
+                }
+#endif
+                if (BRYNET_ERRNO == EINTR)
+                {
+                    throw EintrError();
+                }
+                else
+                {
+                    throw AcceptError(BRYNET_ERRNO);
+                }
+            }
+
+            return TcpSocket::Create(clientFD, true);
+        }
+
+    public:
+        static Ptr Create(BrynetSocketFD fd)
+        {
+            class make_unique_enabler : public ListenSocket
+            {
+            public:
+                explicit make_unique_enabler(BrynetSocketFD fd)
+                    : ListenSocket(fd) 
+                {}
+            };
+
+            return Ptr(new make_unique_enabler(fd));
+        }
+
+    protected:
+        explicit ListenSocket(BrynetSocketFD fd)
+            :
+            mFD(fd)
+        {
+#if defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+            mIdle = brynet::net::TcpSocket::Create(::open("/dev/null", O_RDONLY | O_CLOEXEC), true);
+#endif
+        }
+
+        virtual ~ListenSocket()
+        {
+            brynet::net::base::SocketClose(mFD);
+        }
+
+    private:
+        const BrynetSocketFD  mFD;
+#if defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+        brynet::net::TcpSocket::Ptr mIdle;
+#endif
+
+        friend class TcpConnection;
+    };
+
+} }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/SocketLibFunction.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/SocketLibFunction.hpp
new file mode 100644
index 00000000..97df382c
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/SocketLibFunction.hpp
@@ -0,0 +1,329 @@
+#pragma once
+
+#include <string.h>
+#include <string>
+#include <brynet/net/SocketLibTypes.hpp>
+
+namespace brynet { namespace net { namespace base {
+
+    static bool InitSocket()
+    {
+        bool ret = true;
+#ifdef BRYNET_PLATFORM_WINDOWS
+        static WSADATA g_WSAData;
+        static bool WinSockIsInit = false;
+        if (WinSockIsInit)
+        {
+            return true;
+        }
+        if (WSAStartup(MAKEWORD(2, 2), &g_WSAData) == 0)
+        {
+            WinSockIsInit = true;
+        }
+        else
+        {
+            ret = false;
+        }
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+        signal(SIGPIPE, SIG_IGN);
+#endif
+
+        return ret;
+    }
+
+    static void DestroySocket()
+    {
+#ifdef BRYNET_PLATFORM_WINDOWS
+        WSACleanup();
+#endif
+    }
+
+    static int  SocketNodelay(BrynetSocketFD fd)
+    {
+        const int flag = 1;
+        return ::setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (const char*)&flag, sizeof(flag));
+    }
+
+    static bool SocketBlock(BrynetSocketFD fd)
+    {
+        int err;
+        unsigned long ul = false;
+#ifdef BRYNET_PLATFORM_WINDOWS
+        err = ioctlsocket(fd, FIONBIO, &ul);
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+        err = ioctl(fd, FIONBIO, &ul);
+#endif
+
+        return err != BRYNET_SOCKET_ERROR;
+    }
+
+    static bool SocketNonblock(BrynetSocketFD fd)
+    {
+        int err;
+        unsigned long ul = true;
+#ifdef BRYNET_PLATFORM_WINDOWS
+        err = ioctlsocket(fd, FIONBIO, &ul);
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+        err = ioctl(fd, FIONBIO, &ul);
+#endif
+
+        return err != BRYNET_SOCKET_ERROR;
+    }
+
+    static int  SocketSetSendSize(BrynetSocketFD fd, int sd_size)
+    {
+        return ::setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (const char*)&sd_size, sizeof(sd_size));
+    }
+
+    static int  SocketSetRecvSize(BrynetSocketFD fd, int rd_size)
+    {
+        return ::setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (const char*)&rd_size, sizeof(rd_size));
+    }
+
+    static BrynetSocketFD SocketCreate(int af, int type, int protocol)
+    {
+        return ::socket(af, type, protocol);
+    }
+
+    static void SocketClose(BrynetSocketFD fd)
+    {
+#ifdef BRYNET_PLATFORM_WINDOWS
+        ::closesocket(fd);
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+        ::close(fd);
+#endif
+    }
+
+    static BrynetSocketFD Connect(bool isIPV6, const std::string& server_ip, int port)
+    {
+        InitSocket();
+
+        struct sockaddr_in ip4Addr = sockaddr_in();
+        struct sockaddr_in6 ip6Addr = sockaddr_in6();
+        struct sockaddr_in* paddr = &ip4Addr;
+        int addrLen = sizeof(ip4Addr);
+
+        BrynetSocketFD clientfd = isIPV6 ?
+            SocketCreate(AF_INET6, SOCK_STREAM, 0) :
+            SocketCreate(AF_INET, SOCK_STREAM, 0);
+
+        if (clientfd == BRYNET_INVALID_SOCKET)
+        {
+            return clientfd;
+        }
+
+        bool ptonResult = false;
+        if (isIPV6)
+        {
+            ip6Addr.sin6_family = AF_INET6;
+            ip6Addr.sin6_port = htons(port);
+            ptonResult = inet_pton(AF_INET6, 
+                server_ip.c_str(), 
+                &ip6Addr.sin6_addr) > 0;
+            paddr = (struct sockaddr_in*) & ip6Addr;
+            addrLen = sizeof(ip6Addr);
+        }
+        else
+        {
+            ip4Addr.sin_family = AF_INET;
+            ip4Addr.sin_port = htons(port);
+            ptonResult = inet_pton(AF_INET, 
+                server_ip.c_str(), 
+                &ip4Addr.sin_addr) > 0;
+        }
+
+        if (!ptonResult)
+        {
+            SocketClose(clientfd);
+            return BRYNET_INVALID_SOCKET;
+        }
+
+        while (::connect(clientfd, (struct sockaddr*)paddr, addrLen) < 0)
+        {
+            if (EINTR == BRYNET_ERRNO)
+            {
+                continue;
+            }
+
+            SocketClose(clientfd);
+            return BRYNET_INVALID_SOCKET;
+        }
+
+        return clientfd;
+    }
+
+    static BrynetSocketFD Listen(bool isIPV6, const char* ip, int port, int back_num)
+    {
+        InitSocket();
+
+        struct sockaddr_in ip4Addr = sockaddr_in();
+        struct sockaddr_in6 ip6Addr = sockaddr_in6();
+        struct sockaddr_in* paddr = &ip4Addr;
+        int addrLen = sizeof(ip4Addr);
+
+        const auto socketfd = isIPV6 ?
+            socket(AF_INET6, SOCK_STREAM, 0) :
+            socket(AF_INET, SOCK_STREAM, 0);
+        if (socketfd == BRYNET_INVALID_SOCKET)
+        {
+            return BRYNET_INVALID_SOCKET;
+        }
+
+        bool ptonResult = false;
+        if (isIPV6)
+        {
+            ip6Addr.sin6_family = AF_INET6;
+            ip6Addr.sin6_port = htons(port);
+            ptonResult = inet_pton(AF_INET6, ip, &ip6Addr.sin6_addr) > 0;
+            paddr = (struct sockaddr_in*) & ip6Addr;
+            addrLen = sizeof(ip6Addr);
+        }
+        else
+        {
+            ip4Addr.sin_family = AF_INET;
+            ip4Addr.sin_port = htons(port);
+            ip4Addr.sin_addr.s_addr = INADDR_ANY;
+            ptonResult = inet_pton(AF_INET, ip, &ip4Addr.sin_addr) > 0;
+        }
+
+        const int reuseaddr_value = 1;
+        if (!ptonResult ||
+            ::setsockopt(socketfd,
+                SOL_SOCKET,
+                SO_REUSEADDR,
+                (const char*)&reuseaddr_value,
+                sizeof(int)) < 0)
+        {
+            SocketClose(socketfd);
+            return BRYNET_INVALID_SOCKET;
+        }
+
+        const int bindRet = ::bind(socketfd, (struct sockaddr*)paddr, addrLen);
+        if (bindRet == BRYNET_SOCKET_ERROR ||
+            listen(socketfd, back_num) == BRYNET_SOCKET_ERROR)
+        {
+            SocketClose(socketfd);
+            return BRYNET_INVALID_SOCKET;
+        }
+
+        return socketfd;
+    }
+
+    static std::string getIPString(const struct sockaddr* sa)
+    {
+#ifdef BRYNET_PLATFORM_WINDOWS
+        using PAddrType = PVOID;
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+        using PAddrType = const void*;
+#endif
+        char tmp[INET6_ADDRSTRLEN] = { 0 };
+        switch (sa->sa_family)
+        {
+        case AF_INET:
+            inet_ntop(AF_INET, (PAddrType)(&(((const struct sockaddr_in*)sa)->sin_addr)),
+                tmp, sizeof(tmp));
+            break;
+        case AF_INET6:
+            inet_ntop(AF_INET6, (PAddrType)(&(((const struct sockaddr_in6*)sa)->sin6_addr)),
+                tmp, sizeof(tmp));
+            break;
+        default:
+            return "Unknown AF";
+        }
+
+        return tmp;
+    }
+
+    static std::string GetIPOfSocket(BrynetSocketFD fd)
+    {
+#ifdef BRYNET_PLATFORM_WINDOWS
+        struct sockaddr name = sockaddr();
+        int namelen = sizeof(name);
+        if (::getpeername(fd, (struct sockaddr*) & name, &namelen) == 0)
+        {
+            return getIPString(&name);
+        }
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+        struct sockaddr_in name = sockaddr_in();
+        socklen_t namelen = sizeof(name);
+        if (::getpeername(fd, (struct sockaddr*) & name, &namelen) == 0)
+        {
+            return getIPString((const struct sockaddr*) & name);
+        }
+#endif
+
+        return "";
+    }
+
+    static int SocketSend(BrynetSocketFD fd, const char* buffer, int len)
+    {
+        int transnum = ::send(fd, buffer, len, 0);
+        if (transnum < 0 && BRYNET_EWOULDBLOCK == BRYNET_ERRNO)
+        {
+            transnum = 0;
+        }
+
+        /*  send error if transnum < 0  */
+        return transnum;
+    }
+
+    static BrynetSocketFD Accept(BrynetSocketFD listenSocket, struct sockaddr* addr, socklen_t* addrLen)
+    {
+        return ::accept(listenSocket, addr, addrLen);
+    }
+
+    static struct sockaddr_in6 getPeerAddr(BrynetSocketFD sockfd)
+    {
+        struct sockaddr_in6 peeraddr = sockaddr_in6();
+        auto addrlen = static_cast<socklen_t>(sizeof peeraddr);
+        if (::getpeername(sockfd, (struct sockaddr*)(&peeraddr), &addrlen) < 0)
+        {
+            return peeraddr;
+        }
+        return peeraddr;
+    }
+
+    static struct sockaddr_in6 getLocalAddr(BrynetSocketFD sockfd)
+    {
+        struct sockaddr_in6 localaddr = sockaddr_in6();
+        auto addrlen = static_cast<socklen_t>(sizeof localaddr);
+        if (::getsockname(sockfd, (struct sockaddr*)(&localaddr), &addrlen) < 0)
+        {
+            return localaddr;
+        }
+        return localaddr;
+    }
+
+    static bool IsSelfConnect(BrynetSocketFD fd)
+    {
+        struct sockaddr_in6 localaddr = getLocalAddr(fd);
+        struct sockaddr_in6 peeraddr = getPeerAddr(fd);
+
+        if (localaddr.sin6_family == AF_INET)
+        {
+            const struct sockaddr_in* laddr4 = reinterpret_cast<struct sockaddr_in*>(&localaddr);
+            const struct sockaddr_in* raddr4 = reinterpret_cast<struct sockaddr_in*>(&peeraddr);
+            return laddr4->sin_port == raddr4->sin_port
+                && laddr4->sin_addr.s_addr == raddr4->sin_addr.s_addr;
+        }
+        else if (localaddr.sin6_family == AF_INET6)
+        {
+#ifdef BRYNET_PLATFORM_WINDOWS
+            return localaddr.sin6_port == peeraddr.sin6_port
+                && memcmp(&localaddr.sin6_addr.u.Byte, 
+                    &peeraddr.sin6_addr.u.Byte, 
+                    sizeof localaddr.sin6_addr.u.Byte) == 0;
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+            return localaddr.sin6_port == peeraddr.sin6_port
+                && memcmp(&localaddr.sin6_addr.s6_addr, 
+                    &peeraddr.sin6_addr.s6_addr, 
+                    sizeof localaddr.sin6_addr.s6_addr) == 0;
+#endif
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+} } }
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/SocketLibTypes.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/SocketLibTypes.hpp
new file mode 100644
index 00000000..0a881dee
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/SocketLibTypes.hpp
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <brynet/base/Platform.hpp>
+
+#ifdef BRYNET_PLATFORM_WINDOWS
+#include <winsock2.h>
+#include <WinError.h>
+#include <winsock.h>
+#include <Ws2tcpip.h>
+#include <errno.h>
+
+#elif defined BRYNET_PLATFORM_LINUX
+#include <signal.h>
+#include <sys/epoll.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <unistd.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/eventfd.h>
+#include <sys/uio.h>
+
+#elif defined BRYNET_PLATFORM_DARWIN
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/event.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/uio.h>
+
+#else
+#error "Unsupported OS, please commit an issuse."
+#endif
+
+#ifdef BRYNET_PLATFORM_WINDOWS
+typedef SOCKET BrynetSocketFD;
+#define BRYNET_ERRNO WSAGetLastError()
+#define BRYNET_ENOTSOCK WSAENOTSOCK
+#define BRYNET_EWOULDBLOCK WSAEWOULDBLOCK
+#define BRYNET_EINTR WSAEINTR
+#define BRYNET_ECONNABORTED WSAECONNABORTED
+#define BRYNET_SOCKET_ERROR SOCKET_ERROR
+#define BRYNET_INVALID_SOCKET INVALID_SOCKET
+
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+#define BRYNET_ERRNO errno
+#define BRYNET_ENOTSOCK EBADF
+#define BRYNET_EWOULDBLOCK EAGAIN
+#define BRYNET_EINTR EINTR
+#define BRYNET_ECONNABORTED ECONNABORTED
+typedef int BrynetSocketFD;
+#define BRYNET_SOCKET_ERROR (-1)
+#define BRYNET_INVALID_SOCKET (-1)
+#endif
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/TcpConnection.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/TcpConnection.hpp
new file mode 100644
index 00000000..d8bd6055
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/TcpConnection.hpp
@@ -0,0 +1,1132 @@
+#pragma once
+
+#include <memory>
+#include <functional>
+#include <deque>
+#include <chrono>
+#include <cassert>
+#include <cstring>
+#include <cmath>
+
+#include <brynet/base/Buffer.hpp>
+#include <brynet/base/Timer.hpp>
+#include <brynet/base/NonCopyable.hpp>
+#include <brynet/base/Any.hpp>
+#include <brynet/base/Noexcept.hpp>
+#include <brynet/net/SocketLibFunction.hpp>
+#include <brynet/net/Channel.hpp>
+#include <brynet/net/EventLoop.hpp>
+#include <brynet/net/Socket.hpp>
+#include <brynet/net/SSLHelper.hpp>
+
+#ifdef BRYNET_USE_OPENSSL
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
+
+namespace brynet { namespace net {
+
+    class TcpConnection :   public Channel, 
+                            public brynet::base::NonCopyable, 
+                            public std::enable_shared_from_this<TcpConnection>
+    {
+    public:
+        using Ptr = std::shared_ptr<TcpConnection>;
+
+        using EnterCallback = std::function<void(Ptr)>;
+        using DataCallback = std::function<size_t(const char* buffer, size_t len)>;
+        using DisconnectedCallback = std::function<void(Ptr)>;
+        using PacketSendedCallback = std::function<void(void)>;
+
+        using PacketPtr = std::shared_ptr<std::string>;
+
+    public:
+        Ptr static Create(TcpSocket::Ptr socket, 
+            size_t maxRecvBufferSize, 
+            EnterCallback&& enterCallback, 
+            const EventLoop::Ptr& eventLoop,
+            const SSLHelper::Ptr& sslHelper = nullptr)
+        {
+            class make_shared_enabler : public TcpConnection
+            {
+            public:
+                make_shared_enabler(TcpSocket::Ptr socket,
+                    size_t maxRecvBufferSize,
+                    EnterCallback&& enterCallback,
+                    EventLoop::Ptr eventLoop)
+                    :
+                    TcpConnection(std::move(socket), 
+                        maxRecvBufferSize, 
+                        std::move(enterCallback),
+                        std::move(eventLoop))
+                {}
+            };
+
+            const auto isServerSide = socket->isServerSide();
+            auto session = std::make_shared<make_shared_enabler>(
+                    std::move(socket),
+                    maxRecvBufferSize,
+                    std::move(enterCallback),
+                    eventLoop);
+            (void)isServerSide;
+#ifdef BRYNET_USE_OPENSSL
+            if(sslHelper != nullptr)
+            {
+                if (isServerSide)
+                {
+                    if (sslHelper->getOpenSSLCTX() == nullptr ||
+                        !session->initAcceptSSL(sslHelper->getOpenSSLCTX()))
+                    {
+                        throw std::runtime_error("init ssl failed");
+                    }
+                }
+                else
+                {
+                    if (!session->initConnectSSL())
+                    {
+                        throw std::runtime_error("init ssl failed");
+                    }
+                }
+            }
+#else
+            if (sslHelper != nullptr)
+            {
+                throw std::runtime_error("not enable ssl");
+            }
+#endif
+
+            eventLoop->runAsyncFunctor([session]()
+                                       {
+                                           session->onEnterEventLoop();
+                                       });
+            return session;
+        }
+
+        const EventLoop::Ptr& getEventLoop() const
+        {
+            return mEventLoop;
+        }
+
+        //TODO::如果所属EventLoop已�没有工作，则�能导致内存无�大，因为所投递的请求都没有得到处�
+
+        void                            send(
+            const char* buffer, 
+            size_t len, 
+            PacketSendedCallback&& callback = nullptr)
+        {
+            send(makePacket(buffer, len), std::move(callback));
+        }
+
+        template<typename PacketType>
+        void                            send(
+            PacketType&& packet, 
+            PacketSendedCallback&& 
+            callback = nullptr)
+        {
+            auto packetCapture = std::forward<PacketType>(packet);
+            auto callbackCapture = std::move(callback);
+            auto sharedThis = shared_from_this();
+            mEventLoop->runAsyncFunctor(
+                [sharedThis, packetCapture, callbackCapture]() mutable {
+                const auto len = packetCapture->size();
+                sharedThis->mSendList.emplace_back(PendingPacket{
+                    std::move(packetCapture), 
+                    len, 
+                    std::move(callbackCapture) });
+                sharedThis->runAfterFlush();
+                });
+        }
+
+        void                            setDataCallback(DataCallback&& cb)
+        {
+            auto sharedThis = shared_from_this();
+            mEventLoop->runAsyncFunctor([sharedThis, cb]() mutable {
+                sharedThis->mDataCallback = std::move(cb);
+                sharedThis->processRecvMessage();
+                });
+        }
+        void                            setDisConnectCallback(DisconnectedCallback&& cb)
+        {
+            auto sharedThis = shared_from_this();
+            mEventLoop->runAsyncFunctor([sharedThis, cb]() mutable {
+                sharedThis->mDisConnectCallback = std::move(cb);
+                });
+        }
+
+        /* if checkTime is zero, will cancel check heartbeat */
+        void                            setHeartBeat(std::chrono::nanoseconds checkTime)
+        {
+            auto sharedThis = shared_from_this();
+            mEventLoop->runAsyncFunctor([sharedThis, checkTime]() {
+                if (sharedThis->mTimer.lock() != nullptr)
+                {
+                    sharedThis->mTimer.lock()->cancel();
+                    sharedThis->mTimer.reset();
+                }
+
+                sharedThis->mCheckTime = checkTime;
+                sharedThis->startPingCheckTimer();
+                });
+        }
+
+        void                            postDisConnect()
+        {
+            auto sharedThis = shared_from_this();
+            mEventLoop->runAsyncFunctor([sharedThis]() {
+                sharedThis->procCloseInLoop();
+                });
+        }
+
+        void                            postShutdown()
+        {
+            auto sharedThis = shared_from_this();
+            mEventLoop->runAsyncFunctor([sharedThis]() {
+                sharedThis->mEventLoop->runFunctorAfterLoop([sharedThis]() {
+                    sharedThis->procShutdownInLoop();
+                    });
+                });
+        }
+
+        const std::string& getIP() const
+        {
+            return mIP;
+        }
+
+        static  TcpConnection::PacketPtr  makePacket(const char* buffer, size_t len)
+        {
+            return std::make_shared<std::string>(buffer, len);
+        }
+
+    protected:
+        TcpConnection(TcpSocket::Ptr socket,
+            size_t maxRecvBufferSize,
+            EnterCallback&& enterCallback,
+            EventLoop::Ptr eventLoop) BRYNET_NOEXCEPT
+            :
+#ifdef BRYNET_PLATFORM_WINDOWS
+            mOvlRecv(port::Win::OverlappedType::OverlappedRecv),
+            mOvlSend(port::Win::OverlappedType::OverlappedSend),
+            mPostClose(false),
+#endif
+            mIP(socket->getRemoteIP()),
+            mSocket(std::move(socket)),
+            mEventLoop(std::move(eventLoop)),
+            mAlreadyClose(false),
+            mMaxRecvBufferSize(maxRecvBufferSize),
+            mEnterCallback(std::move(enterCallback))
+        {
+            mRecvData = false;
+            mCheckTime = std::chrono::steady_clock::duration::zero();
+            mIsPostFlush = false;
+
+            mCanWrite = true;
+
+#ifdef BRYNET_PLATFORM_WINDOWS
+            mPostRecvCheck = false;
+            mPostWriteCheck = false;
+#endif
+            growRecvBuffer();
+
+#ifdef BRYNET_USE_OPENSSL
+            mSSLCtx = nullptr;
+            mSSL = nullptr;
+            mIsHandsharked = false;
+#endif
+        }
+
+        ~TcpConnection() BRYNET_NOEXCEPT override
+        {
+#ifdef BRYNET_USE_OPENSSL
+            if (mSSL != nullptr)
+            {
+                SSL_free(mSSL);
+                mSSL = nullptr;
+            }
+            if (mSSLCtx != nullptr)
+            {
+                SSL_CTX_free(mSSLCtx);
+                mSSLCtx = nullptr;
+            }
+#endif
+
+            if (mTimer.lock())
+            {
+                mTimer.lock()->cancel();
+            }
+        }
+
+    private:
+        void                            growRecvBuffer()
+        {
+            if (mRecvBuffer == nullptr)
+            {
+                mRecvBuffer.reset(brynet::base::buffer_new(std::min<size_t>(16 * 1024, mMaxRecvBufferSize)));
+                mRecvBuffOriginSize = buffer_getsize(mRecvBuffer.get());
+            }
+            else
+            {
+                if (buffer_getsize(mRecvBuffer.get()) >= mMaxRecvBufferSize)
+                {
+                    return;
+                }
+
+                mCurrentTanhXDiff += 0.2;
+                const auto newTanh = std::tanh(mCurrentTanhXDiff);
+                const auto maxSizeDiff = mMaxRecvBufferSize - mRecvBuffOriginSize;
+                const auto NewSize = mRecvBuffOriginSize + (maxSizeDiff * newTanh);
+
+                assert(NewSize <= mMaxRecvBufferSize);
+                std::unique_ptr<struct brynet::base::buffer_s, BufferDeleter> newBuffer(brynet::base::buffer_new(NewSize));
+                buffer_write(newBuffer.get(),
+                    buffer_getreadptr(mRecvBuffer.get()),
+                    buffer_getreadvalidcount(mRecvBuffer.get()));
+                mRecvBuffer = std::move(newBuffer);
+            }
+        }
+
+        /* must called in network thread */
+        bool                            onEnterEventLoop()
+        {
+            assert(mEventLoop->isInLoopThread());
+            if (!mEventLoop->isInLoopThread())
+            {
+                return false;
+            }
+
+            if (!brynet::net::base::SocketNonblock(mSocket->getFD()) ||
+                !mEventLoop->linkChannel(mSocket->getFD(), this))
+            {
+                return false;
+            }
+
+            const auto findRet = mEventLoop->getTcpConnection(mSocket->getFD());
+            (void)findRet;
+            assert(findRet == nullptr);
+
+#ifdef BRYNET_USE_OPENSSL
+            if (mSSL != nullptr)
+            {
+                mEventLoop->addTcpConnection(mSocket->getFD(), shared_from_this());
+                processSSLHandshake();
+                return true;
+            }
+#endif
+
+            if (!checkRead())
+            {
+                return false;
+            }
+
+            mEventLoop->addTcpConnection(mSocket->getFD(), shared_from_this());
+            causeEnterCallback();
+
+            return true;
+        }
+
+#ifdef BRYNET_USE_OPENSSL
+            bool                            initAcceptSSL(SSL_CTX* ctx)
+        {
+            if (mSSL != nullptr)
+            {
+                return false;
+            }
+
+            mSSL = SSL_new(ctx);
+            if (SSL_set_fd(mSSL, mSocket->getFD()) != 1)
+            {
+                ERR_print_errors_fp(stdout);
+                ::fflush(stdout);
+                return false;
+            }
+
+            return true;
+        }
+        bool                            initConnectSSL()
+        {
+            if (mSSLCtx != nullptr)
+            {
+                return false;
+            }
+
+            mSSLCtx = SSL_CTX_new(SSLv23_client_method());
+            mSSL = SSL_new(mSSLCtx);
+
+            if (SSL_set_fd(mSSL, mSocket->getFD()) != 1)
+            {
+                ERR_print_errors_fp(stdout);
+                ::fflush(stdout);
+                return false;
+            }
+
+            return true;
+        }
+#endif
+
+        void                            pingCheck()
+        {
+            mTimer.reset();
+            if (mRecvData)
+            {
+                mRecvData = false;
+                startPingCheckTimer();
+            }
+            else
+            {
+                procCloseInLoop();
+            }
+        }
+
+        void                            startPingCheckTimer()
+        {
+            if (!mTimer.lock() && 
+                mCheckTime != std::chrono::steady_clock::duration::zero())
+            {
+                std::weak_ptr<TcpConnection> weakedThis = shared_from_this();
+                mTimer = mEventLoop->runAfter(mCheckTime, [weakedThis]() {
+                    auto sharedThis = weakedThis.lock();
+                    if (sharedThis != nullptr)
+                    {
+                        sharedThis->pingCheck();
+                    }
+                    });
+            }
+        }
+
+        void                            canRecv() override
+        {
+#ifdef BRYNET_PLATFORM_WINDOWS
+            mPostRecvCheck = false;
+            if (mPostClose)
+            {
+                if (!mPostWriteCheck)
+                {
+                    onClose();
+                }
+                return;
+            }
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+            if (mAlreadyClose)
+            {
+                return;
+            }
+#endif
+
+#ifdef BRYNET_USE_OPENSSL
+            if (mSSL != nullptr
+                && !mIsHandsharked
+                && (!processSSLHandshake() || !mIsHandsharked))
+            {
+                return;
+            }
+#endif
+
+            recv();
+        }
+
+        void                            canSend() override
+        {
+#ifdef BRYNET_PLATFORM_WINDOWS
+            mPostWriteCheck = false;
+            if (mPostClose)
+            {
+                if (!mPostRecvCheck)
+                {
+                    onClose();
+                }
+                return;
+            }
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+            if (mAlreadyClose)
+            {
+                return;
+            }
+#endif
+            mCanWrite = true;
+
+#ifdef BRYNET_USE_OPENSSL
+            if (mSSL != nullptr
+                && !mIsHandsharked
+                && (!processSSLHandshake() || !mIsHandsharked))
+            {
+                return;
+            }
+#endif
+
+            runAfterFlush();
+        }
+
+        bool                            checkRead()
+        {
+            bool check_ret = true;
+#ifdef BRYNET_PLATFORM_WINDOWS
+            static CHAR temp[] = { 0 };
+            static WSABUF  in_buf = { 0, temp };
+
+            if (mPostRecvCheck)
+            {
+                return check_ret;
+            }
+
+            DWORD   dwBytes = 0;
+            DWORD   flag = 0;
+            const int ret = WSARecv(mSocket->getFD(), 
+                &in_buf, 
+                1, 
+                &dwBytes, 
+                &flag, 
+                &(mOvlRecv.base), 
+                0);
+            if (ret == BRYNET_SOCKET_ERROR)
+            {
+                check_ret = (BRYNET_ERRNO == WSA_IO_PENDING);
+            }
+
+            if (check_ret)
+            {
+                mPostRecvCheck = true;
+            }
+#endif
+
+            return check_ret;
+        }
+
+        bool                            checkWrite()
+        {
+            bool check_ret = true;
+#ifdef BRYNET_PLATFORM_WINDOWS
+            static WSABUF wsendbuf[1] = { {NULL, 0} };
+
+            if (mPostWriteCheck)
+            {
+                return check_ret;
+            }
+
+            DWORD send_len = 0;
+            const int ret = WSASend(mSocket->getFD(),
+                wsendbuf, 
+                1, 
+                &send_len, 
+                0, 
+                &(mOvlSend.base), 
+                0);
+            if (ret == BRYNET_SOCKET_ERROR)
+            {
+                check_ret = (BRYNET_ERRNO == WSA_IO_PENDING);
+            }
+
+            if (check_ret)
+            {
+                mPostWriteCheck = true;
+            }
+#endif
+            return check_ret;
+        }
+
+
+        void                            recv()
+        {
+            bool must_close = false;
+#ifdef BRYNET_USE_OPENSSL
+            const bool notInSSL = (mSSL == nullptr);
+#else
+            const bool notInSSL = false;
+#endif
+
+            while (true)
+            {
+                if (buffer_getwritevalidcount(mRecvBuffer.get()) == 0
+                    || buffer_getreadvalidcount(mRecvBuffer.get()) == 0)
+                {
+                    buffer_adjustto_head(mRecvBuffer.get());
+                }
+
+                const auto tryRecvLen = buffer_getwritevalidcount(mRecvBuffer.get());
+                if (tryRecvLen == 0)
+                {
+#ifdef BRYNET_PLATFORM_WINDOWS
+                    checkRead();
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+                    //force recheck IN-OUT Event
+                    recheckEvent();
+#endif
+                    break;
+                }
+
+                int retlen = 0;
+#ifdef BRYNET_USE_OPENSSL
+                if (mSSL != nullptr)
+                {
+                    retlen = SSL_read(mSSL, 
+                        buffer_getwriteptr(mRecvBuffer.get()), tryRecvLen);
+                }
+                else
+                {
+                    retlen = ::recv(mSocket->getFD(), 
+                        buffer_getwriteptr(mRecvBuffer.get()), tryRecvLen, 0);
+                }
+#else
+                retlen = ::recv(mSocket->getFD(), 
+                    buffer_getwriteptr(mRecvBuffer.get()), 
+                    static_cast<int>(tryRecvLen), 
+                    0);
+#endif
+
+                if (retlen == 0)
+                {
+                    must_close = true;
+                    break;
+                }
+                else if (retlen < 0)
+                {
+#ifdef BRYNET_USE_OPENSSL
+                    if ((mSSL != nullptr && 
+                        SSL_get_error(mSSL, retlen) == SSL_ERROR_WANT_READ) ||
+                        (BRYNET_ERRNO == BRYNET_EWOULDBLOCK))
+                    {
+                        must_close = !checkRead();
+                    }
+                    else
+                    {
+                        must_close = true;
+                    }
+#else
+                    if (BRYNET_ERRNO != BRYNET_EWOULDBLOCK)
+                    {
+                        must_close = true;
+                    }
+                    else
+                    {
+                        must_close = !checkRead();
+                    }
+#endif
+                    break;
+                }
+
+                mRecvData = true;
+                buffer_addwritepos(mRecvBuffer.get(), static_cast<size_t>(retlen));
+                if (buffer_getreadvalidcount(mRecvBuffer.get())
+                    == buffer_getsize(mRecvBuffer.get()))
+                {
+                    growRecvBuffer();
+                }
+
+                if (notInSSL && retlen < static_cast<int>(tryRecvLen))
+                {
+                    must_close = !checkRead();
+                    break;
+                }
+            }
+
+            processRecvMessage();
+
+            if (must_close)
+            {
+                procCloseInLoop();
+            }
+        }
+
+        void                            flush()
+        {
+#ifdef BRYNET_PLATFORM_WINDOWS
+            normalFlush();
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+#ifdef BRYNET_USE_OPENSSL
+            if (mSSL != nullptr)
+            {
+                normalFlush();
+            }
+            else
+            {
+                quickFlush();
+            }
+#else
+            quickFlush();
+#endif
+#endif
+        }
+        void                            normalFlush()
+        {
+#ifdef BRYNET_PLATFORM_WINDOWS
+            static __declspec(thread) char* threadLocalSendBuf = nullptr;
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+            static __thread char* threadLocalSendBuf = nullptr;
+#endif
+            static  const   int SENDBUF_SIZE = 1024 * 32;
+            if (threadLocalSendBuf == nullptr)
+            {
+                threadLocalSendBuf = (char*)malloc(SENDBUF_SIZE);
+            }
+
+#ifdef BRYNET_USE_OPENSSL
+            const bool notInSSL = (mSSL == nullptr);
+#else
+            const bool notInSSL = false;
+#endif
+
+            bool must_close = false;
+
+            while (!mSendList.empty() && mCanWrite)
+            {
+                char* sendptr = threadLocalSendBuf;
+                size_t     wait_send_size = 0;
+
+                for (auto it = mSendList.begin(); it != mSendList.end(); ++it)
+                {
+                    auto& packet = *it;
+                    auto packetLeftBuf = (char*)(packet.data->c_str() + (packet.data->size() - packet.left));
+                    const auto packetLeftLen = packet.left;
+
+                    if ((wait_send_size + packetLeftLen) > SENDBUF_SIZE)
+                    {
+                        if (it == mSendList.begin())
+                        {
+                            sendptr = packetLeftBuf;
+                            wait_send_size = packetLeftLen;
+                        }
+                        break;
+                    }
+
+                    memcpy(sendptr + wait_send_size, packetLeftBuf, packetLeftLen);
+                    wait_send_size += packetLeftLen;
+                }
+
+                if (wait_send_size == 0)
+                {
+                    break;
+                }
+
+                int send_retlen = 0;
+#ifdef BRYNET_USE_OPENSSL
+                if (mSSL != nullptr)
+                {
+                    send_retlen = SSL_write(mSSL, sendptr, wait_send_size);
+                }
+                else
+                {
+                    send_retlen = ::send(mSocket->getFD(), sendptr, wait_send_size, 0);
+                }
+#else
+                send_retlen = ::send(mSocket->getFD(), sendptr, static_cast<int>(wait_send_size), 0);
+#endif
+                if (send_retlen <= 0)
+                {
+
+#ifdef BRYNET_USE_OPENSSL
+                    if ((mSSL != nullptr && SSL_get_error(mSSL, send_retlen) == SSL_ERROR_WANT_WRITE) ||
+                        (BRYNET_ERRNO == BRYNET_EWOULDBLOCK))
+                    {
+                        mCanWrite = false;
+                        must_close = !checkWrite();
+                    }
+                    else
+                    {
+                        must_close = true;
+                    }
+#else
+                    if (BRYNET_ERRNO == BRYNET_EWOULDBLOCK)
+                    {
+                        mCanWrite = false;
+                        must_close = !checkWrite();
+                    }
+                    else
+                    {
+                        must_close = true;
+                    }
+#endif
+                    break;
+                }
+
+                auto tmp_len = static_cast<size_t>(send_retlen);
+                for (auto it = mSendList.begin(); it != mSendList.end();)
+                {
+                    auto& packet = *it;
+                    if (packet.left > tmp_len)
+                    {
+                        packet.left -= tmp_len;
+                        break;
+                    }
+
+                    tmp_len -= packet.left;
+                    if (packet.mCompleteCallback != nullptr)
+                    {
+                        (packet.mCompleteCallback)();
+                    }
+                    it = mSendList.erase(it);
+                }
+
+                if (notInSSL && static_cast<size_t>(send_retlen) != wait_send_size)
+                {
+                    mCanWrite = false;
+                    must_close = !checkWrite();
+                    break;
+                }
+            }
+
+            if (must_close)
+            {
+                procCloseInLoop();
+            }
+        }
+#if defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+        void                            quickFlush()
+        {
+#ifndef MAX_IOVEC
+            constexpr size_t MAX_IOVEC = 1024;
+#endif
+
+            struct iovec iov[MAX_IOVEC];
+            bool must_close = false;
+
+            while (!mSendList.empty() && mCanWrite)
+            {
+                size_t num = 0;
+                size_t ready_send_len = 0;
+                for (const auto& p : mSendList)
+                {
+                    iov[num].iov_base = (void*)(p.data->c_str() + (p.data->size() - p.left));
+                    iov[num].iov_len = p.left;
+                    ready_send_len += p.left;
+
+                    num++;
+                    if (num >= MAX_IOVEC)
+                    {
+                        break;
+                    }
+                }
+
+                if (num == 0)
+                {
+                    break;
+                }
+
+                const int send_len = writev(mSocket->getFD(), iov, static_cast<int>(num));
+                if (send_len <= 0)
+                {
+                    if (BRYNET_ERRNO == BRYNET_EWOULDBLOCK)
+                    {
+                        mCanWrite = false;
+                        must_close = !checkWrite();
+                    }
+                    else
+                    {
+                        must_close = true;
+                    }
+                    break;
+                }
+
+                auto tmp_len = static_cast<size_t>(send_len);
+                for (auto it = mSendList.begin(); it != mSendList.end();)
+                {
+                    PendingPacket& b = *it;
+                    if (b.left > tmp_len)
+                    {
+                        b.left -= tmp_len;
+                        break;
+                    }
+
+                    tmp_len -= b.left;
+                    if (b.mCompleteCallback != nullptr)
+                    {
+                        b.mCompleteCallback();
+                    }
+                    it = mSendList.erase(it);
+                }
+
+                if (static_cast<size_t>(send_len) != ready_send_len)
+                {
+                    mCanWrite = false;
+                    must_close = !checkWrite();
+                    break;
+                }
+            }
+
+            if (must_close)
+            {
+                procCloseInLoop();
+            }
+        }
+#endif
+
+        void                            onClose() override
+        {
+            if (mAlreadyClose)
+            {
+                return;
+            }
+            mAlreadyClose = true;
+
+#if defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+            unregisterPollerEvent();
+#endif
+
+            assert(mEnterCallback == nullptr);
+            auto callBack = mDisConnectCallback;
+            auto sharedThis = shared_from_this();
+            auto eventLoop = mEventLoop;
+            std::shared_ptr<TcpSocket> socket = std::move(const_cast<TcpSocket::Ptr&&>(mSocket));
+            mEventLoop->runFunctorAfterLoop([callBack,
+                sharedThis,
+                eventLoop,
+                socket]() {
+                    if (callBack != nullptr)
+                    {
+                        callBack(sharedThis);
+                    }
+                    auto tmp = eventLoop->getTcpConnection(socket->getFD());
+                    assert(tmp == sharedThis);
+                    if (tmp == sharedThis)
+                    {
+                        eventLoop->removeTcpConnection(socket->getFD());
+                    }
+                });
+
+            mCanWrite = false;
+            mDisConnectCallback = nullptr;
+            mDataCallback = nullptr;
+            mRecvBuffer = nullptr;
+        }
+
+        void                            procCloseInLoop()
+        {
+            mCanWrite = false;
+#ifdef BRYNET_PLATFORM_WINDOWS
+            if (mPostWriteCheck || mPostRecvCheck)
+            {
+                if (mPostClose)
+                {
+                    return;
+                }
+                mPostClose = true;
+                //windows下立�关闭socket�能导致fd被�外的TcpConnection�用,而导致此对象在IOCP返回相关完�结果时内存已�释放
+                if (mPostRecvCheck)
+                {
+                    CancelIoEx(HANDLE(mSocket->getFD()), &mOvlRecv.base);
+                }
+                if (mPostWriteCheck)
+                {
+                    CancelIoEx(HANDLE(mSocket->getFD()), &mOvlSend.base);
+                }
+            }
+            else
+            {
+                onClose();
+            }
+#elif defined BRYNET_PLATFORM_LINUX
+            onClose();
+#elif defined BRYNET_PLATFORM_DARWIN
+            onClose();
+#endif
+        }
+
+        void                            procShutdownInLoop()
+        {
+            mCanWrite = false;
+            if (mSocket != nullptr)
+            {
+#ifdef BRYNET_PLATFORM_WINDOWS
+                shutdown(mSocket->getFD(), SD_SEND);
+#elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+                shutdown(mSocket->getFD(), SHUT_WR);
+#endif
+            }
+        }
+
+        void                            runAfterFlush()
+        {
+            if (!mIsPostFlush && !mSendList.empty() && mCanWrite)
+            {
+                auto sharedThis = shared_from_this();
+                mEventLoop->runFunctorAfterLoop([sharedThis]() {
+                    sharedThis->mIsPostFlush = false;
+                    sharedThis->flush();
+                    });
+
+                mIsPostFlush = true;
+            }
+        }
+#if defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN
+        void                            recheckEvent()
+        {
+#ifdef BRYNET_PLATFORM_LINUX
+            struct epoll_event ev = { 0, { nullptr } };
+            ev.events = EPOLLET | EPOLLIN | EPOLLOUT | EPOLLRDHUP;
+            ev.data.ptr = (Channel*)(this);
+            epoll_ctl(mEventLoop->getEpollHandle(), EPOLL_CTL_MOD, mSocket->getFD(), &ev);
+#elif defined BRYNET_PLATFORM_DARWIN
+            struct kevent ev[2];
+            memset(&ev, 0, sizeof(ev));
+            int n = 0;
+            EV_SET(&ev[n++], mSocket->getFD(), EVFILT_READ, EV_ENABLE, 0, 0, (Channel*)(this));
+            EV_SET(&ev[n++], mSocket->getFD(), EVFILT_WRITE, EV_ENABLE, 0, 0, (Channel*)(this));
+
+            struct timespec now = { 0, 0 };
+            kevent(mEventLoop->getKqueueHandle(), ev, n, NULL, 0, &now);
+#endif
+        }
+        void                            unregisterPollerEvent()
+        {
+#ifdef BRYNET_PLATFORM_LINUX
+            struct epoll_event ev = { 0, { nullptr } };
+            epoll_ctl(mEventLoop->getEpollHandle(), EPOLL_CTL_DEL, mSocket->getFD(), &ev);
+#elif defined BRYNET_PLATFORM_DARWIN
+            struct kevent ev[2];
+            memset(&ev, 0, sizeof(ev));
+            int n = 0;
+            EV_SET(&ev[n++], mSocket->getFD(), EVFILT_READ, EV_DELETE, 0, 0, NULL);
+            EV_SET(&ev[n++], mSocket->getFD(), EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
+
+            struct timespec now = { 0, 0 };
+            kevent(mEventLoop->getKqueueHandle(), ev, n, NULL, 0, &now);
+#endif
+        }
+#endif
+#ifdef BRYNET_USE_OPENSSL
+        bool                            processSSLHandshake()
+        {
+            if (mIsHandsharked)
+            {
+                return true;
+            }
+
+            bool mustClose = false;
+            int ret = 0;
+
+            if (mSSLCtx != nullptr)
+            {
+                ret = SSL_connect(mSSL);
+            }
+            else
+            {
+                ret = SSL_accept(mSSL);
+            }
+
+            if (ret == 1)
+            {
+                mIsHandsharked = true;
+                if (checkRead())
+                {
+                    causeEnterCallback();
+                }
+                else
+                {
+                    mustClose = true;
+                }
+            }
+            else if (ret == 0)
+            {
+                mustClose = true;
+            }
+            else if (ret < 0)
+            {
+                int err = SSL_get_error(mSSL, ret);
+                if (err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ)
+                {
+                    if (!checkRead())
+                    {
+                        mustClose = true;
+                    }
+                }
+                else
+                {
+                    mustClose = true;
+                }
+            }
+
+            if (mustClose)
+            {
+                causeEnterCallback();
+                procCloseInLoop();
+                return false;
+            }
+            return true;
+        }
+#endif
+        void                            causeEnterCallback()
+        {
+            assert(mEventLoop->isInLoopThread());
+            if (mEventLoop->isInLoopThread() && mEnterCallback != nullptr)
+            {
+                auto tmp = mEnterCallback;
+                mEnterCallback = nullptr;
+                tmp(shared_from_this());
+            }
+        }
+
+        void                            processRecvMessage()
+        {
+            if (mDataCallback != nullptr && buffer_getreadvalidcount(mRecvBuffer.get()) > 0)
+            {
+                const auto proclen = mDataCallback(buffer_getreadptr(mRecvBuffer.get()),
+                    buffer_getreadvalidcount(mRecvBuffer.get()));
+                assert(proclen <= buffer_getreadvalidcount(mRecvBuffer.get()));
+                if (proclen <= buffer_getreadvalidcount(mRecvBuffer.get()))
+                {
+                    buffer_addreadpos(mRecvBuffer.get(), proclen);
+                }
+            }
+        }
+
+    private:
+
+#ifdef BRYNET_PLATFORM_WINDOWS
+        struct port::Win::OverlappedExt mOvlRecv;
+        struct port::Win::OverlappedExt mOvlSend;
+
+        bool                            mPostRecvCheck;
+        bool                            mPostWriteCheck;
+        bool                            mPostClose;
+#endif
+        const std::string               mIP;
+        const TcpSocket::Ptr            mSocket;
+        const EventLoop::Ptr            mEventLoop;
+        bool                            mCanWrite;
+        bool                            mAlreadyClose;
+
+        class BufferDeleter
+        {
+        public:
+            void operator()(struct brynet::base::buffer_s* ptr) const
+            {
+                brynet::base::buffer_delete(ptr);
+            }
+        };
+        std::unique_ptr<struct brynet::base::buffer_s, BufferDeleter> mRecvBuffer;
+        double                          mCurrentTanhXDiff = 0;
+        size_t                          mRecvBuffOriginSize = 0;
+        const size_t                    mMaxRecvBufferSize;
+
+        struct PendingPacket
+        {
+            PacketPtr  data;
+            size_t      left;
+            PacketSendedCallback  mCompleteCallback;
+        };
+
+        using PacketListType = std::deque<PendingPacket>;
+        PacketListType                  mSendList;
+
+        EnterCallback                   mEnterCallback;
+        DataCallback                    mDataCallback;
+        DisconnectedCallback            mDisConnectCallback;
+
+        bool                            mIsPostFlush;
+
+#ifdef BRYNET_USE_OPENSSL
+        SSL_CTX*                        mSSLCtx;
+        SSL*                            mSSL;
+        bool                            mIsHandsharked;
+#endif
+        bool                            mRecvData;
+        std::chrono::nanoseconds        mCheckTime{};
+        brynet::base::Timer::WeakPtr    mTimer;
+    };
+
+} }
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/TcpService.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/TcpService.hpp
new file mode 100644
index 00000000..6da5d006
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/TcpService.hpp
@@ -0,0 +1,91 @@
+#pragma once
+
+#include <brynet/net/detail/TCPServiceDetail.hpp>
+
+namespace brynet { namespace net {
+
+    class AddSocketOption
+    {
+    private:
+        using AddSocketOptionFunc = detail::AddSocketOptionFunc;
+        using AddSocketOptionInfo = detail::AddSocketOptionInfo;
+
+    public:
+        static AddSocketOptionFunc AddEnterCallback(
+            TcpConnection::EnterCallback callback)
+        {
+            return [callback](AddSocketOptionInfo& option) {
+                option.enterCallback.push_back(callback);
+            };
+        }
+#ifdef BRYNET_USE_OPENSSL
+        static AddSocketOptionFunc WithClientSideSSL()
+        {
+            return [](AddSocketOptionInfo& option) {
+                option.useSSL = true;
+            };
+        }
+        static AddSocketOptionFunc WithServerSideSSL(SSLHelper::Ptr sslHelper)
+        {
+            return [sslHelper](AddSocketOptionInfo& option) {
+                option.sslHelper = sslHelper;
+                option.useSSL = true;
+            };
+        }
+#endif
+        static AddSocketOptionFunc WithMaxRecvBufferSize(size_t size)
+        {
+            return [size](AddSocketOptionInfo& option) {
+                option.maxRecvBufferSize = size;
+            };
+        }
+        static AddSocketOptionFunc WithForceSameThreadLoop(bool same)
+        {
+            return [same](AddSocketOptionInfo& option) {
+                option.forceSameThreadLoop = same;
+            };
+        }
+    };
+
+    class TcpService :  public detail::TcpServiceDetail,
+                        public std::enable_shared_from_this<TcpService>
+    {
+    public:
+        using Ptr = std::shared_ptr<TcpService>;
+        using FrameCallback = detail::TcpServiceDetail::FrameCallback;
+
+    public:
+        static  Ptr Create()
+        {
+            struct make_shared_enabler : public TcpService {};
+            return std::make_shared<make_shared_enabler>();
+        }
+
+        void        startWorkerThread(size_t threadNum, 
+            FrameCallback callback = nullptr)
+        {
+            detail::TcpServiceDetail::startWorkerThread(threadNum, callback);
+        }
+
+        void        stopWorkerThread()
+        {
+            detail::TcpServiceDetail::stopWorkerThread();
+        }
+
+        template<typename... Options>
+        bool            addTcpConnection(TcpSocket::Ptr socket, 
+            const Options& ... options)
+        {
+            return detail::TcpServiceDetail::addTcpConnection(std::move(socket), options...);
+        }
+
+        EventLoop::Ptr  getRandomEventLoop()
+        {
+            return detail::TcpServiceDetail::getRandomEventLoop();
+        }
+
+    private:
+        TcpService() = default;
+    };
+
+} }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/AddSocketOptionInfo.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/AddSocketOptionInfo.hpp
new file mode 100644
index 00000000..5a5aa322
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/AddSocketOptionInfo.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <brynet/net/TcpConnection.hpp>
+#include <brynet/net/SSLHelper.hpp>
+
+namespace brynet { namespace net { namespace detail {
+    
+    class AddSocketOptionInfo final
+    {
+    public:
+        AddSocketOptionInfo()
+        {
+            useSSL = false;
+            forceSameThreadLoop = false;
+            maxRecvBufferSize = 128;
+        }
+
+        std::vector<TcpConnection::EnterCallback>   enterCallback;
+        SSLHelper::Ptr                  sslHelper;
+        bool                            useSSL;
+        bool                            forceSameThreadLoop;
+        size_t                          maxRecvBufferSize;
+    };
+
+    using AddSocketOptionFunc = std::function<void(AddSocketOptionInfo& option)>;
+
+} } }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/ConnectorDetail.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/ConnectorDetail.hpp
new file mode 100644
index 00000000..93e0f818
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/ConnectorDetail.hpp
@@ -0,0 +1,161 @@
+#pragma once
+
+#include <functional>
+#include <memory>
+#include <cassert>
+#include <set>
+#include <map>
+#include <thread>
+
+#include <brynet/base/NonCopyable.hpp>
+#include <brynet/base/CPP_VERSION.hpp>
+#include <brynet/base/Any.hpp>
+#include <brynet/base/Noexcept.hpp>
+#include <brynet/net/SocketLibFunction.hpp>
+#include <brynet/net/Poller.hpp>
+#include <brynet/net/Exception.hpp>
+#include <brynet/net/EventLoop.hpp>
+#include <brynet/net/Socket.hpp>
+#include <brynet/net/detail/ConnectorWorkInfo.hpp>
+
+#ifdef BRYNET_HAVE_LANG_CXX17
+#include <shared_mutex>
+#else
+#include <mutex>
+#endif
+
+namespace brynet { namespace net { namespace detail {
+
+    class AsyncConnectorDetail :  public brynet::base::NonCopyable
+    {
+    protected:
+        void    startWorkerThread()
+        {
+#ifdef BRYNET_HAVE_LANG_CXX17
+            std::lock_guard<std::shared_mutex> lck(mThreadGuard);
+#else
+            std::lock_guard<std::mutex> lck(mThreadGuard);
+#endif
+
+            if (mThread != nullptr)
+            {
+                return;
+            }
+
+            mIsRun = std::make_shared<bool>(true);
+            mWorkInfo = std::make_shared<detail::ConnectorWorkInfo>();
+            mEventLoop = std::make_shared<EventLoop>();
+
+            auto eventLoop = mEventLoop;
+            auto workerInfo = mWorkInfo;
+            auto isRun = mIsRun;
+
+            mThread = std::make_shared<std::thread>([eventLoop, workerInfo, isRun]() {
+                while (*isRun)
+                {
+                    detail::RunOnceCheckConnect(eventLoop, workerInfo);
+                }
+
+                workerInfo->causeAllFailed();
+                });
+        }
+
+        void    stopWorkerThread()
+        {
+#ifdef BRYNET_HAVE_LANG_CXX17
+            std::lock_guard<std::shared_mutex> lck(mThreadGuard);
+#else
+            std::lock_guard<std::mutex> lck(mThreadGuard);
+#endif
+
+            if (mThread == nullptr)
+            {
+                return;
+            }
+
+            mEventLoop->runAsyncFunctor([this]() {
+                *mIsRun = false;
+                });
+
+            try
+            {
+                if (mThread->joinable())
+                {
+                    mThread->join();
+                }
+            }
+            catch (std::system_error & e)
+            {
+                (void)e;
+            }
+
+            mEventLoop = nullptr;
+            mWorkInfo = nullptr;
+            mIsRun = nullptr;
+            mThread = nullptr;
+        }
+
+        void    asyncConnect(const std::vector<detail::ConnectOptionFunc>& options)
+        {
+#ifdef BRYNET_HAVE_LANG_CXX17
+            std::shared_lock<std::shared_mutex> lck(mThreadGuard);
+#else
+            std::lock_guard<std::mutex> lck(mThreadGuard);
+#endif
+            detail::ConnectOptionsInfo option;
+            for (const auto& func : options)
+            {
+                func(option);
+            }
+
+            if (option.completedCallback == nullptr && option.faledCallback == nullptr)
+            {
+                throw ConnectException("all callback is nullptr");
+            }
+            if (option.ip.empty())
+            {
+                throw ConnectException("addr is empty");
+            }
+
+            if (!(*mIsRun))
+            {
+                throw ConnectException("work thread already stop");
+            }
+
+            auto workInfo = mWorkInfo;
+            auto address = detail::AsyncConnectAddr(std::move(option.ip),
+                option.port,
+                option.timeout,
+                std::move(option.completedCallback),
+                std::move(option.faledCallback),
+                std::move(option.processCallbacks));
+            mEventLoop->runAsyncFunctor([workInfo, address]() {
+                    workInfo->processConnect(address);
+                });
+        }
+
+    protected:
+        AsyncConnectorDetail()
+        {
+            mIsRun = std::make_shared<bool>(false);
+        }
+
+        virtual ~AsyncConnectorDetail()
+        {
+            stopWorkerThread();
+        }
+
+    private:
+        std::shared_ptr<EventLoop>          mEventLoop;
+
+        std::shared_ptr<detail::ConnectorWorkInfo>  mWorkInfo;
+        std::shared_ptr<std::thread>        mThread;
+#ifdef BRYNET_HAVE_LANG_CXX17
+        std::shared_mutex                   mThreadGuard;
+#else
+        std::mutex                          mThreadGuard;
+#endif
+        std::shared_ptr<bool>               mIsRun;
+    };
+
+} } }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/ConnectorWorkInfo.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/ConnectorWorkInfo.hpp
new file mode 100644
index 00000000..c0a85382
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/ConnectorWorkInfo.hpp
@@ -0,0 +1,368 @@
+#pragma once
+
+#include <functional>
+#include <memory>
+
+#include <brynet/base/NonCopyable.hpp>
+#include <brynet/base/CPP_VERSION.hpp>
+#include <brynet/net/SocketLibTypes.hpp>
+#include <brynet/net/Socket.hpp>
+#include <brynet/net/Poller.hpp>
+
+#ifdef BRYNET_HAVE_LANG_CXX17
+#include <shared_mutex>
+#else
+#include <mutex>
+#endif
+
+namespace brynet { namespace net { namespace detail {
+
+    class ConnectOptionsInfo;
+    using ConnectOptionFunc = std::function<void(ConnectOptionsInfo & option)>;
+
+    class AsyncConnectAddr final
+    {
+    public:
+        using CompletedCallback = std::function<void(TcpSocket::Ptr)>;
+        using ProcessTcpSocketCallback = std::function<void(TcpSocket&)>;
+        using FailedCallback = std::function<void()>;
+
+    public:
+        AsyncConnectAddr(std::string&& ip,
+            int port,
+            std::chrono::nanoseconds timeout,
+            CompletedCallback&& successCB,
+            FailedCallback&& failedCB,
+            std::vector<ProcessTcpSocketCallback>&& processCallbacks)
+            :
+            mIP(std::move(ip)),
+            mPort(port),
+            mTimeout(timeout),
+            mSuccessCB(std::move(successCB)),
+            mFailedCB(std::move(failedCB)),
+            mProcessCallbacks(std::move(processCallbacks))
+        {
+        }
+
+        const std::string& getIP() const
+        {
+            return mIP;
+        }
+
+        int                         getPort() const
+        {
+            return mPort;
+        }
+
+        const CompletedCallback&    getSuccessCB() const
+        {
+            return mSuccessCB;
+        }
+
+        const FailedCallback&       getFailedCB() const
+        {
+            return mFailedCB;
+        }
+
+        const std::vector<ProcessTcpSocketCallback>& getProcessCallbacks() const
+        {
+            return mProcessCallbacks;
+        }
+
+        std::chrono::nanoseconds    getTimeout() const
+        {
+            return mTimeout;
+        }
+
+    private:
+        const std::string                           mIP;
+        const int                                   mPort;
+        const std::chrono::nanoseconds              mTimeout;
+        const CompletedCallback                     mSuccessCB;
+        const FailedCallback                        mFailedCB;
+        const std::vector<ProcessTcpSocketCallback> mProcessCallbacks;
+        };
+
+    class ConnectorWorkInfo final : public brynet::base::NonCopyable
+    {
+    public:
+        using Ptr = std::shared_ptr<ConnectorWorkInfo>;
+
+        ConnectorWorkInfo() BRYNET_NOEXCEPT
+        {
+            mPoller.reset(brynet::base::poller_new());
+            mPollResult.reset(brynet::base::stack_new(1024, sizeof(BrynetSocketFD)));
+        }
+
+        void    checkConnectStatus(int millsecond)
+        {
+            if (poller_poll(mPoller.get(), millsecond) <= 0)
+            {
+                return;
+            }
+
+            std::set<BrynetSocketFD>  totalFds;
+            std::set<BrynetSocketFD>  successFds;
+
+            poller_visitor(mPoller.get(), brynet::base::WriteCheck, mPollResult.get());
+            while (true)
+            {
+                auto p = stack_popfront(mPollResult.get());
+                if (p == nullptr)
+                {
+                    break;
+                }
+
+                const auto fd = *(BrynetSocketFD*)p;
+                totalFds.insert(fd);
+                if (isConnectSuccess(fd, false) && 
+                    !brynet::net::base::IsSelfConnect(fd))
+                {
+                    successFds.insert(fd);
+                }
+            }
+
+            for (auto fd : totalFds)
+            {
+                poller_remove(mPoller.get(), fd);
+
+                const auto it = mConnectingInfos.find(fd);
+                if (it == mConnectingInfos.end())
+                {
+                    continue;
+                }
+
+                auto socket = TcpSocket::Create(fd, false);
+                const auto& connectingInfo = it->second;
+                if (successFds.find(fd) != successFds.end())
+                {
+                    for (const auto& process : connectingInfo.processCallbacks)
+                    {
+                        process(*socket);
+                    }
+                    if (connectingInfo.successCB != nullptr)
+                    {
+                        connectingInfo.successCB(std::move(socket));
+                    }
+                }
+                else
+                {
+                    if (connectingInfo.failedCB != nullptr)
+                    {
+                        connectingInfo.failedCB();
+                    }
+                }
+
+                mConnectingInfos.erase(it);
+            }
+        }
+
+        bool    isConnectSuccess(BrynetSocketFD clientfd, bool willCheckWrite) const
+        {
+            if (willCheckWrite && !poller_check(mPoller.get(), clientfd, brynet::base::WriteCheck))
+            {
+                return false;
+            }
+
+            int error = BRYNET_SOCKET_ERROR;
+            int len = sizeof(error);
+            if (getsockopt(clientfd, 
+                SOL_SOCKET, 
+                SO_ERROR, 
+                (char*)&error,
+                (socklen_t*)&len) == BRYNET_SOCKET_ERROR)
+            {
+                return false;
+            }
+
+            return error == 0;
+        }
+
+        void    checkTimeout()
+        {
+            for (auto it = mConnectingInfos.begin(); it != mConnectingInfos.end();)
+            {
+                const auto now = std::chrono::steady_clock::now();
+                if ((now - it->second.startConnectTime) < it->second.timeout)
+                {
+                    ++it;
+                    continue;
+                }
+
+                auto fd = it->first;
+                auto cb = it->second.failedCB;
+
+                poller_remove(mPoller.get(), fd);
+                mConnectingInfos.erase(it++);
+
+                brynet::net::base::SocketClose(fd);
+                if (cb != nullptr)
+                {
+                    //TODO::don't modify mConnectingInfos in cb
+                    cb();
+                }
+            }
+        }
+
+        void    processConnect(const AsyncConnectAddr& addr)
+        {
+            struct sockaddr_in server_addr = sockaddr_in();
+            BrynetSocketFD clientfd = BRYNET_INVALID_SOCKET;
+
+#ifdef BRYNET_PLATFORM_WINDOWS
+            const int ExpectedError = WSAEWOULDBLOCK;
+#else
+            const int ExpectedError = EINPROGRESS;
+#endif
+            int n = 0;
+
+            brynet::net::base::InitSocket();
+
+            clientfd = brynet::net::base::SocketCreate(AF_INET, SOCK_STREAM, 0);
+            if (clientfd == BRYNET_INVALID_SOCKET)
+            {
+                goto FAILED;
+            }
+
+            brynet::net::base::SocketNonblock(clientfd);
+            server_addr.sin_family = AF_INET;
+            inet_pton(AF_INET, addr.getIP().c_str(), &server_addr.sin_addr.s_addr);
+            server_addr.sin_port = static_cast<decltype(server_addr.sin_port)>(htons(addr.getPort()));
+
+            n = connect(clientfd, (struct sockaddr*) & server_addr, sizeof(struct sockaddr));
+            if (n == 0)
+            {
+                if (brynet::net::base::IsSelfConnect(clientfd))
+                {
+                    goto FAILED;
+                }
+            }
+            else if (BRYNET_ERRNO != ExpectedError)
+            {
+                goto FAILED;
+            }
+            else
+            {
+                ConnectingInfo ci;
+                ci.startConnectTime = std::chrono::steady_clock::now();
+                ci.successCB = addr.getSuccessCB();
+                ci.failedCB = addr.getFailedCB();
+                ci.timeout = addr.getTimeout();
+                ci.processCallbacks = addr.getProcessCallbacks();
+
+                mConnectingInfos[clientfd] = ci;
+                poller_add(mPoller.get(), clientfd, brynet::base::WriteCheck);
+
+                return;
+            }
+
+            if (addr.getSuccessCB() != nullptr)
+            {
+                auto tcpSocket = TcpSocket::Create(clientfd, false);
+                for (const auto& process : addr.getProcessCallbacks())
+                {
+                    process(*tcpSocket);
+                }
+                addr.getSuccessCB()(std::move(tcpSocket));
+            }
+            return;
+
+        FAILED:
+            if (clientfd != BRYNET_INVALID_SOCKET)
+            {
+                brynet::net::base::SocketClose(clientfd);
+                clientfd = BRYNET_INVALID_SOCKET;
+                (void)clientfd;
+            }
+            if (addr.getFailedCB() != nullptr)
+            {
+                addr.getFailedCB()();
+            }
+        }
+
+        void    causeAllFailed()
+        {
+            auto copyMap = mConnectingInfos;
+            mConnectingInfos.clear();
+
+            for (const auto& v : copyMap)
+            {
+                auto fd = v.first;
+                auto cb = v.second.failedCB;
+
+                poller_remove(mPoller.get(), fd);
+                brynet::net::base::SocketClose(fd);
+                if (cb != nullptr)
+                {
+                    cb();
+                }
+            }
+        }
+
+    private:
+        class ConnectingInfo
+        {
+        public:
+            ConnectingInfo()
+            {
+                timeout = std::chrono::nanoseconds::zero();
+            }
+
+            std::chrono::steady_clock::time_point   startConnectTime;
+            std::chrono::nanoseconds                timeout;
+            AsyncConnectAddr::CompletedCallback                       successCB;
+            AsyncConnectAddr::FailedCallback                          failedCB;
+            std::vector<AsyncConnectAddr::ProcessTcpSocketCallback>   processCallbacks;
+        };
+
+        std::map<BrynetSocketFD, ConnectingInfo>  mConnectingInfos;
+
+        class PollerDeleter
+        {
+        public:
+            void operator()(struct brynet::base::poller_s* ptr) const
+            {
+                brynet::base::poller_delete(ptr);
+            }
+        };
+        class StackDeleter
+        {
+        public:
+            void operator()(struct brynet::base::stack_s* ptr) const
+            {
+                brynet::base::stack_delete(ptr);
+            }
+        };
+
+        std::unique_ptr<struct brynet::base::poller_s, PollerDeleter> mPoller;
+        std::unique_ptr<struct brynet::base::stack_s, StackDeleter>   mPollResult;
+    };
+
+    static void RunOnceCheckConnect(
+        const std::shared_ptr<brynet::net::EventLoop>& eventLoop,
+        const std::shared_ptr<ConnectorWorkInfo>& workerInfo)
+    {
+        eventLoop->loop(std::chrono::milliseconds(10).count());
+        workerInfo->checkConnectStatus(0);
+        workerInfo->checkTimeout();
+    }
+
+    class ConnectOptionsInfo final
+    {
+    public:
+        ConnectOptionsInfo()
+            :
+            port(0),
+            timeout(std::chrono::seconds(10))
+        {
+        }
+
+        std::string ip;
+        int port;
+        std::chrono::nanoseconds timeout;
+        std::vector<AsyncConnectAddr::ProcessTcpSocketCallback> processCallbacks;
+        AsyncConnectAddr::CompletedCallback completedCallback;
+        AsyncConnectAddr::FailedCallback faledCallback;
+    };
+
+} } }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/IOLoopData.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/IOLoopData.hpp
new file mode 100644
index 00000000..888f3126
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/IOLoopData.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include <functional>
+#include <thread>
+#include <cstdint>
+#include <memory>
+
+#include <brynet/base/NonCopyable.hpp>
+#include <brynet/net/EventLoop.hpp>
+
+namespace brynet { namespace net { namespace detail {
+
+    class TcpServiceDetail;
+
+    class IOLoopData :  public brynet::base::NonCopyable, 
+                        public std::enable_shared_from_this<IOLoopData>
+    {
+    public:
+        using Ptr = std::shared_ptr<IOLoopData>;
+
+        static  Ptr Create(EventLoop::Ptr eventLoop,
+            std::shared_ptr<std::thread> ioThread)
+        {
+            class make_shared_enabler : public IOLoopData
+            {
+            public:
+                make_shared_enabler(EventLoop::Ptr eventLoop, 
+                    std::shared_ptr<std::thread> ioThread)
+                    :
+                    IOLoopData(std::move(eventLoop), std::move(ioThread))
+                {}
+            };
+
+            return std::make_shared<make_shared_enabler>(std::move(eventLoop), 
+                std::move(ioThread));
+        }
+
+        const EventLoop::Ptr& getEventLoop() const
+        {
+            return mEventLoop;
+        }
+
+    protected:
+        const std::shared_ptr<std::thread>& getIOThread() const
+        {
+            return mIOThread;
+        }
+
+        IOLoopData(EventLoop::Ptr eventLoop, 
+            std::shared_ptr<std::thread> ioThread)
+            :
+            mEventLoop(std::move(eventLoop)), 
+            mIOThread(std::move(ioThread))
+        {}
+        virtual                         ~IOLoopData() = default;
+
+        const EventLoop::Ptr            mEventLoop;
+
+    private:
+        std::shared_ptr<std::thread>    mIOThread;
+
+        friend class TcpServiceDetail;
+    };
+
+    using IOLoopDataPtr = std::shared_ptr<IOLoopData>;
+
+} } }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/ListenThreadDetail.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/ListenThreadDetail.hpp
new file mode 100644
index 00000000..634fc804
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/ListenThreadDetail.hpp
@@ -0,0 +1,169 @@
+#pragma once
+
+#include <string>
+#include <functional>
+#include <thread>
+#include <memory>
+#include <mutex>
+#include <vector>
+#include <cstdlib>
+#include <iostream>
+
+#include <brynet/base/NonCopyable.hpp>
+#include <brynet/base/Noexcept.hpp>
+#include <brynet/net/SocketLibFunction.hpp>
+#include <brynet/net/AsyncConnector.hpp>
+#include <brynet/net/wrapper/ConnectionBuilder.hpp>
+#include <brynet/net/Socket.hpp>
+
+namespace brynet { namespace net { namespace detail {
+
+    class ListenThreadDetail :  public brynet::base::NonCopyable
+    {
+    protected:
+        using AccepCallback = std::function<void(TcpSocket::Ptr)>;
+        using TcpSocketProcessCallback = std::function<void(TcpSocket&)>;
+
+        void    startListen()
+        {
+            std::lock_guard<std::mutex> lck(mListenThreadGuard);
+
+            if (mListenThread != nullptr)
+            {
+                return;
+            }
+
+            const auto fd = brynet::net::base::Listen(mIsIPV6, mIP.c_str(), mPort, 512);
+            if (fd == BRYNET_INVALID_SOCKET)
+            {
+                throw BrynetCommonException(
+                    std::string("listen error of:") + std::to_string(BRYNET_ERRNO));
+            }
+
+            mRunListen = std::make_shared<bool>(true);
+
+            auto listenSocket = std::shared_ptr<ListenSocket>(ListenSocket::Create(fd));
+            auto isRunListen = mRunListen;
+            auto callback = mCallback;
+            auto processCallbacks = mProcessCallbacks;
+            mListenThread = std::make_shared<std::thread>(
+                [isRunListen, listenSocket, callback, processCallbacks]() mutable {
+                while (*isRunListen)
+                {
+                    auto clientSocket = runOnceListen(listenSocket);
+                    if (clientSocket == nullptr)
+                    {
+                        continue;
+                    }
+
+                    if (*isRunListen)
+                    {
+                        for (const auto& process : processCallbacks)
+                        {
+                            process(*clientSocket);
+                        }
+                        callback(std::move(clientSocket));
+                    }
+                }
+                });
+        }
+
+        void    stopListen()
+        {
+            std::lock_guard<std::mutex> lck(mListenThreadGuard);
+
+            if (mListenThread == nullptr)
+            {
+                return;
+            }
+
+            *mRunListen = false;
+            auto selfIP = mIP;
+            if (selfIP == "0.0.0.0")
+            {
+                selfIP = "127.0.0.1";
+            }
+
+            auto connector = AsyncConnector::Create();
+            connector->startWorkerThread();
+
+            wrapper::SocketConnectBuilder connectBuilder;
+            connectBuilder
+                .configureConnector(connector)
+                .configureConnectOptions({
+                    ConnectOption::WithTimeout(std::chrono::seconds(2)),
+                    ConnectOption::WithAddr(selfIP, mPort)
+                    })
+                .syncConnect();
+
+            try
+            {
+                if (mListenThread->joinable())
+                {
+                    mListenThread->join();
+                }
+            }
+            catch (std::system_error & e)
+            {
+                (void)e;
+            }
+            mListenThread = nullptr;
+        }
+
+    protected:
+        ListenThreadDetail(bool isIPV6,
+            const std::string& ip,
+            int port,
+            const AccepCallback& callback,
+            const std::vector<TcpSocketProcessCallback>& processCallbacks)
+            :
+            mIsIPV6(isIPV6),
+            mIP(ip),
+            mPort(port),
+            mCallback(callback),
+            mProcessCallbacks(processCallbacks)
+        {
+            if (mCallback == nullptr)
+            {
+                throw BrynetCommonException("accept callback is nullptr");
+            }
+            mRunListen = std::make_shared<bool>(false);
+        }
+
+        virtual ~ListenThreadDetail() BRYNET_NOEXCEPT
+        {
+            stopListen();
+        }
+
+    private:
+        static brynet::net::TcpSocket::Ptr runOnceListen(const std::shared_ptr<ListenSocket>& listenSocket)
+        {
+            try
+            {
+                return listenSocket->accept();
+            }
+            catch (const EintrError & e)
+            {
+                std::cerr << "accept eintr execption:" << e.what() << std::endl;
+            }
+            catch (const AcceptError & e)
+            {
+                std::cerr << "accept execption:" << e.what() << std::endl;
+            }
+
+            return nullptr;
+        }
+
+    private:
+        const bool                          mIsIPV6;
+        const std::string                   mIP;
+        const int                           mPort;
+        const AccepCallback                 mCallback;
+        const std::vector<TcpSocketProcessCallback>    mProcessCallbacks;
+
+        std::shared_ptr<bool>               mRunListen;
+        std::shared_ptr<std::thread>        mListenThread;
+        std::mutex                          mListenThreadGuard;
+    };
+
+} } }
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/TCPServiceDetail.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/TCPServiceDetail.hpp
new file mode 100644
index 00000000..d64c4223
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/TCPServiceDetail.hpp
@@ -0,0 +1,198 @@
+#pragma once
+
+#include <vector>
+#include <string>
+#include <functional>
+#include <thread>
+#include <cstdint>
+#include <memory>
+#include <random>
+
+#include <brynet/base/NonCopyable.hpp>
+#include <brynet/base/Noexcept.hpp>
+#include <brynet/net/TcpConnection.hpp>
+#include <brynet/net/SSLHelper.hpp>
+#include <brynet/net/Socket.hpp>
+#include <brynet/net/detail/IOLoopData.hpp>
+#include <brynet/net/detail/AddSocketOptionInfo.hpp>
+
+namespace brynet { namespace net { namespace detail {
+
+    class TcpServiceDetail : public brynet::base::NonCopyable
+    {
+    protected:
+        using FrameCallback = std::function<void(const EventLoop::Ptr&)>;
+        const static unsigned int sDefaultLoopTimeOutMS = 100;
+
+        void        startWorkerThread(size_t threadNum, 
+            FrameCallback callback = nullptr)
+        {
+            std::lock_guard<std::mutex> lck(mServiceGuard);
+            std::lock_guard<std::mutex> lock(mIOLoopGuard);
+
+            if (!mIOLoopDatas.empty())
+            {
+                return;
+            }
+
+            mRunIOLoop = std::make_shared<bool>(true);
+
+            mIOLoopDatas.resize(threadNum);
+            for (auto& v : mIOLoopDatas)
+            {
+                auto eventLoop = std::make_shared<EventLoop>();
+                auto runIoLoop = mRunIOLoop;
+                v = IOLoopData::Create(eventLoop, 
+                    std::make_shared<std::thread>(
+                        [callback, runIoLoop, eventLoop]() {
+                        while (*runIoLoop)
+                        {
+                            eventLoop->loopCompareNearTimer(sDefaultLoopTimeOutMS);
+                            if (callback != nullptr)
+                            {
+                                callback(eventLoop);
+                            }
+                        }
+                    }));
+            }
+        }
+
+        void        stopWorkerThread()
+        {
+            std::lock_guard<std::mutex> lck(mServiceGuard);
+            std::lock_guard<std::mutex> lock(mIOLoopGuard);
+
+            *mRunIOLoop = false;
+
+            for (const auto& v : mIOLoopDatas)
+            {
+                v->getEventLoop()->wakeup();
+                try
+                {
+                    if (v->getIOThread()->joinable())
+                    {
+                        v->getIOThread()->join();
+                    }
+                }
+                catch (std::system_error & e)
+                {
+                    (void)e;
+                }
+            }
+            mIOLoopDatas.clear();
+        }
+
+        template<typename... Options>
+        bool            addTcpConnection(TcpSocket::Ptr socket, 
+            const Options& ... options)
+        {
+            return _addTcpConnection(std::move(socket), { options... });
+        }
+
+        EventLoop::Ptr  getRandomEventLoop()
+        {
+            std::lock_guard<std::mutex> lock(mIOLoopGuard);
+
+            const auto ioLoopSize = mIOLoopDatas.size();
+            if (ioLoopSize == 0)
+            {
+                return nullptr;
+            }
+            else if (ioLoopSize == 1)
+            {
+                return mIOLoopDatas.front()->getEventLoop();
+            }
+            else
+            {
+                return mIOLoopDatas[mRandom() % ioLoopSize]->getEventLoop();
+            }
+        }
+
+        TcpServiceDetail() BRYNET_NOEXCEPT
+            :
+            mRandom(static_cast<unsigned int>(
+                std::chrono::system_clock::now().time_since_epoch().count()))
+        {
+            mRunIOLoop = std::make_shared<bool>(false);
+        }
+
+        virtual ~TcpServiceDetail() BRYNET_NOEXCEPT
+        {
+            stopWorkerThread();
+        }
+
+        bool        _addTcpConnection(TcpSocket::Ptr socket,
+            const std::vector<AddSocketOptionFunc>& optionFuncs)
+        {
+            AddSocketOptionInfo options;
+            for (const auto& v : optionFuncs)
+            {
+                if (v != nullptr)
+                {
+                    v(options);
+                }
+            }
+
+            if (options.maxRecvBufferSize <= 0)
+            {
+                throw BrynetCommonException("buffer size is zero");
+            }
+
+            EventLoop::Ptr eventLoop;
+            if (options.forceSameThreadLoop)
+            {
+                eventLoop = getSameThreadEventLoop();
+            }
+            else
+            {
+                eventLoop = getRandomEventLoop();
+            }
+            if (eventLoop == nullptr)
+            {
+                return false;
+            }
+
+            auto wrapperEnterCallback = [options](const TcpConnection::Ptr& tcpConnection) {
+                for (const auto& callback : options.enterCallback)
+                {
+                    callback(tcpConnection);
+                }
+            };
+
+            if (options.useSSL && options.sslHelper == nullptr)
+            {
+                options.sslHelper = SSLHelper::Create();
+            }
+
+            TcpConnection::Create(std::move(socket),
+                options.maxRecvBufferSize,
+                wrapperEnterCallback,
+                eventLoop,
+                options.sslHelper);
+
+            return true;
+        }
+
+        EventLoop::Ptr      getSameThreadEventLoop()
+        {
+            std::lock_guard<std::mutex> lock(mIOLoopGuard);
+            for (const auto& v : mIOLoopDatas)
+            {
+                if (v->getEventLoop()->isInLoopThread())
+                {
+                    return v->getEventLoop();
+                }
+            }
+            return nullptr;
+        }
+
+    private:
+        std::vector<IOLoopDataPtr>  mIOLoopDatas;
+        mutable std::mutex          mIOLoopGuard;
+        std::shared_ptr<bool>       mRunIOLoop;
+
+        std::mutex                  mServiceGuard;
+        std::mt19937                mRandom;
+    };
+
+} } }
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/WakeupChannel.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/WakeupChannel.hpp
new file mode 100644
index 00000000..83e3c16f
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/detail/WakeupChannel.hpp
@@ -0,0 +1,139 @@
+#pragma once
+
+#include <cstdint>
+#include <functional>
+#include <vector>
+#include <mutex>
+#include <memory>
+#include <atomic>
+#include <cassert>
+
+#include <brynet/base/NonCopyable.hpp>
+#include <brynet/net/SocketLibFunction.hpp>
+#ifdef BRYNET_PLATFORM_WINDOWS
+#include <brynet/net/port/Win.hpp>
+#endif
+
+#include <brynet/net/Channel.hpp>
+#include <brynet/net/Socket.hpp>
+
+namespace brynet { namespace net { namespace detail {
+
+#ifdef BRYNET_PLATFORM_WINDOWS
+    class WakeupChannel final : public Channel, public brynet::base::NonCopyable
+    {
+    public:
+        explicit WakeupChannel(HANDLE iocp) 
+            :
+            mIOCP(iocp), 
+            mWakeupOvl(port::Win::OverlappedType::OverlappedRecv)
+        {
+        }
+
+        bool    wakeup() BRYNET_NOEXCEPT
+        {
+            return PostQueuedCompletionStatus(mIOCP, 
+                0, 
+                reinterpret_cast<ULONG_PTR>(this), 
+                &mWakeupOvl.base);
+        }
+
+    private:
+        void    canRecv() BRYNET_NOEXCEPT override
+        {
+            ;
+        }
+
+        void    canSend() BRYNET_NOEXCEPT override
+        {
+            ;
+        }
+
+        void    onClose() BRYNET_NOEXCEPT override
+        {
+            ;
+        }
+
+        HANDLE                      mIOCP;
+        port::Win::OverlappedExt    mWakeupOvl;
+    };
+#elif defined BRYNET_PLATFORM_LINUX
+    class WakeupChannel final : public Channel, public brynet::base::NonCopyable
+    {
+    public:
+        explicit WakeupChannel(BrynetSocketFD fd) : mUniqueFd(fd)
+        {
+        }
+
+        bool    wakeup()
+        {
+            uint64_t one = 1;
+            return write(mUniqueFd.getFD(), &one, sizeof one) > 0;
+        }
+
+    private:
+        void    canRecv() override
+        {
+            char temp[1024 * 10];
+            while (true)
+            {
+                auto n = read(mUniqueFd.getFD(), temp, sizeof(temp));
+                if (n == -1 || static_cast<size_t>(n) < sizeof(temp))
+                {
+                    break;
+                }
+            }
+        }
+
+        void    canSend() override
+        {
+        }
+
+        void    onClose() override
+        {
+        }
+
+    private:
+        UniqueFd    mUniqueFd;
+    };
+
+#elif defined BRYNET_PLATFORM_DARWIN
+    class WakeupChannel final : public Channel, public brynet::base::NonCopyable
+    {
+    public:
+        explicit WakeupChannel(int kqueuefd, int ident) 
+            : 
+            mKqueueFd(kqueuefd), 
+            mUserEvent(ident)
+        {
+        }
+
+        bool wakeup()
+        {
+            struct kevent ev;
+            EV_SET(&ev, mUserEvent, EVFILT_USER, 0, NOTE_TRIGGER, 0, NULL);
+
+            struct timespec timeout = { 0, 0 };
+            return kevent(mKqueueFd, &ev, 1, NULL, 0, &timeout) == 0;
+        }
+
+    private:
+        void canRecv() override
+        {
+        }
+
+        void canSend() override
+        {
+        }
+
+        void onClose() override
+        {
+        }
+
+    private:
+        int    mKqueueFd;
+        int    mUserEvent;
+    };
+#endif
+
+} } }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/HttpFormat.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/HttpFormat.hpp
new file mode 100644
index 00000000..e6f4dcd8
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/HttpFormat.hpp
@@ -0,0 +1,222 @@
+#pragma once
+
+#include <string>
+#include <array>
+#include <map>
+#include <cassert>
+
+namespace brynet { namespace net { namespace http {
+
+    class HttpQueryParameter final
+    {
+    public:
+        void    add(const std::string& k, const std::string& v)
+        {
+            if (!mParameter.empty())
+            {
+                mParameter += "&";
+            }
+
+            mParameter += k;
+            mParameter += "=";
+            mParameter += v;
+        }
+
+        const std::string& getResult() const
+        {
+            return mParameter;
+        }
+
+    private:
+        std::string mParameter;
+    };
+
+    class HttpRequest final
+    {
+    public:
+
+        enum class HTTP_METHOD
+        {
+            HTTP_METHOD_HEAD,
+            HTTP_METHOD_GET,
+            HTTP_METHOD_POST,
+            HTTP_METHOD_PUT,
+            HTTP_METHOD_DELETE,
+            HTTP_METHOD_MAX
+        };
+
+        HttpRequest()
+        {
+            setMethod(HTTP_METHOD::HTTP_METHOD_GET);
+        }
+
+        void        setMethod(HTTP_METHOD protocol)
+        {
+            mMethod = protocol;
+            assert(mMethod > HTTP_METHOD::HTTP_METHOD_HEAD && 
+                mMethod < HTTP_METHOD::HTTP_METHOD_MAX);
+        }
+
+        void        setHost(const std::string& host)
+        {
+            addHeadValue("Host", host);
+        }
+
+        void        setUrl(const std::string& url)
+        {
+            mUrl = url;
+        }
+
+        void        setCookie(const std::string& v)
+        {
+            addHeadValue("Cookie", v);
+        }
+
+        void        setContentType(const std::string& v)
+        {
+            addHeadValue("Content-Type", v);
+        }
+
+        void        setQuery(const std::string& query)
+        {
+            mQuery = query;
+        }
+
+        void        setBody(const std::string& body)
+        {
+            mBody = body;
+            addHeadValue("Content-Length", std::to_string(body.size()));
+        }
+
+        void        addHeadValue(const std::string& field, 
+            const std::string& value)
+        {
+            mHeadField[field] = value;
+        }
+
+        std::string      getResult() const
+        {
+            const auto MethodMax = static_cast<size_t>(HTTP_METHOD::HTTP_METHOD_MAX);
+            const static std::array<std::string, MethodMax> HttpMethodString =
+                { "HEAD", "GET", "POST", "PUT", "DELETE" };
+
+            std::string ret;
+            if (mMethod >= HTTP_METHOD::HTTP_METHOD_HEAD && 
+                mMethod < HTTP_METHOD::HTTP_METHOD_MAX)
+            {
+                ret += HttpMethodString[static_cast<size_t>(mMethod)];
+            }
+
+            ret += " ";
+            ret += mUrl;
+            if (!mQuery.empty())
+            {
+                ret += "?";
+                ret += mQuery;
+            }
+
+            ret += " HTTP/1.1\r\n";
+
+            for (auto& v : mHeadField)
+            {
+                ret += v.first;
+                ret += ": ";
+                ret += v.second;
+                ret += "\r\n";
+            }
+
+            ret += "\r\n";
+
+            if (!mBody.empty())
+            {
+                ret += mBody;
+            }
+
+            return ret;
+        }
+
+    private:
+        std::string                         mUrl;
+        std::string                         mQuery;
+        std::string                         mBody;
+        HTTP_METHOD                         mMethod;
+        std::map<std::string, std::string>  mHeadField;
+    };
+
+    class HttpResponse final
+    {
+    public:
+        enum class HTTP_RESPONSE_STATUS
+        {
+            NONE,
+            OK = 200,
+        };
+
+        HttpResponse() : mStatus(HTTP_RESPONSE_STATUS::OK)
+        {
+        }
+
+        void        setStatus(HTTP_RESPONSE_STATUS status)
+        {
+            mStatus = status;
+        }
+
+        void        setContentType(const std::string& v)
+        {
+            addHeadValue("Content-Type", v);
+        }
+
+        void        addHeadValue(const std::string& field, 
+            const std::string& value)
+        {
+            mHeadField[field] = value;
+        }
+
+        void        setBody(const std::string& body)
+        {
+            mBody = body;
+            addHeadValue("Content-Length", std::to_string(body.size()));
+        }
+
+        std::string      getResult() const
+        {
+            std::string ret = "HTTP/1.1 ";
+
+            ret += std::to_string(static_cast<int>(mStatus));
+            switch (mStatus)
+            {
+            case HTTP_RESPONSE_STATUS::OK:
+                ret += " OK";
+                break;
+            default:
+                ret += "UNKNOWN";
+                break;
+            }
+
+            ret += "\r\n";
+
+            for (auto& v : mHeadField)
+            {
+                ret += v.first;
+                ret += ": ";
+                ret += v.second;
+                ret += "\r\n";
+            }
+
+            ret += "\r\n";
+
+            if (!mBody.empty())
+            {
+                ret += mBody;
+            }
+
+            return ret;
+        }
+
+    private:
+        HTTP_RESPONSE_STATUS                mStatus;
+        std::map<std::string, std::string>  mHeadField;
+        std::string                         mBody;
+    };
+
+} } }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/HttpParser.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/HttpParser.hpp
new file mode 100644
index 00000000..2dfe32a8
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/HttpParser.hpp
@@ -0,0 +1,322 @@
+#pragma once
+
+#include <string>
+#include <map>
+#include <memory>
+#include <cassert>
+#include <cstring>
+
+#include "http_parser.h"
+#include <brynet/net/http/WebSocketFormat.hpp>
+
+namespace brynet { namespace net { namespace http {
+
+    class HttpService;
+
+    class HTTPParser
+    {
+    public:
+        using Ptr = std::shared_ptr<HTTPParser>;
+
+        explicit HTTPParser(http_parser_type parserType)
+            :
+            mParserType(parserType)
+        {
+            mLastWasValue = true;
+
+            mIsWebSocket = false;
+            mIsKeepAlive = false;
+            mISCompleted = false;
+            mStatusCode = 0;
+            mWSFrameType = WebSocketFormat::WebSocketFrameType::ERROR_FRAME;
+            mSettings.on_status = sStatusHandle;
+            mSettings.on_body = sBodyHandle;
+            mSettings.on_url = sUrlHandle;
+            mSettings.on_header_field = sHeadField;
+            mSettings.on_header_value = sHeadValue;
+            mSettings.on_headers_complete = sHeadComplete;
+            mSettings.on_message_begin = sMessageBegin;
+            mSettings.on_message_complete = sMessageEnd;
+            mSettings.on_chunk_header = sChunkHeader;
+            mSettings.on_chunk_complete = sChunkComplete;
+            mParser.data = this;
+
+            http_parser_init(&mParser, mParserType);
+        }
+
+        virtual ~HTTPParser() = default;
+
+        bool    isWebSocket() const
+        {
+            return mIsWebSocket;
+        }
+
+        bool    isKeepAlive() const
+        {
+            return mIsKeepAlive;
+        }
+
+        int     method() const
+        {
+            // mMethod's value defined in http_method, such as  HTTP_GET�HTTP_POST.
+            // if mMethod is -1, it's invalid.
+            return mMethod;
+        }
+
+        const std::string& getPath() const
+        {
+            return mPath;
+        }
+
+        const std::string& getQuery() const
+        {
+            return mQuery;
+        }
+
+        const std::string& getStatus() const
+        {
+            return mStatus;
+        }
+
+        int         getStatusCode() const
+        {
+            return mStatusCode;
+        }
+
+        bool        hasEntry(const std::string& key, 
+            const std::string& value) const
+        {
+            const auto it = mHeadValues.find(key);
+            return it != mHeadValues.end() && value == it->second;
+        }
+
+        bool        hasKey(const std::string& key) const
+        {
+            return mHeadValues.find(key) != mHeadValues.end();
+        }
+
+        const std::string& getValue(const std::string& key) const
+        {
+            const static std::string emptystr("");
+
+            auto it = mHeadValues.find(key);
+            if (it != mHeadValues.end())
+            {
+                return (*it).second;
+            }
+            else
+            {
+                return emptystr;
+            }
+        }
+
+        const std::string& getBody() const
+        {
+            return mBody;
+        }
+
+        std::string& getWSCacheFrame()
+        {
+            return mWSCacheFrame;
+        }
+
+        std::string& getWSParseString()
+        {
+            return mWSParsePayload;
+        }
+
+        WebSocketFormat::WebSocketFrameType     getWSFrameType() const
+        {
+            return mWSFrameType;
+        }
+
+        void    cacheWSFrameType(WebSocketFormat::WebSocketFrameType frameType)
+        {
+            mWSFrameType = frameType;
+        }
+
+    private:
+        void    clearParse()
+        {
+            mISCompleted = false;
+            mHeadValues.clear();
+            mPath.clear();
+            mQuery.clear();
+        }
+
+        size_t  tryParse(const char* buffer, size_t len)
+        {
+            const size_t nparsed = http_parser_execute(&mParser, &mSettings, buffer, len);
+            if (mISCompleted)
+            {
+                mIsWebSocket = mParser.upgrade;
+                mIsKeepAlive = !hasEntry("Connection", "close");
+                mMethod = mParser.method;
+                http_parser_init(&mParser, mParserType);
+            }
+
+            return nparsed;
+        }
+
+        bool    isCompleted() const
+        {
+            return mISCompleted;
+        }
+
+    private:
+        static int  sChunkHeader(http_parser* hp)
+        {
+            (void)hp;
+            return 0;
+        }
+
+        static int  sChunkComplete(http_parser* hp)
+        {
+            (void)hp;
+            return 0;
+        }
+
+        static int  sMessageBegin(http_parser* hp)
+        {
+            HTTPParser* httpParser = (HTTPParser*)hp->data;
+            httpParser->mLastWasValue = true;
+            httpParser->mCurrentField.clear();
+            httpParser->mCurrentValue.clear();
+
+            return 0;
+        }
+
+        static int  sMessageEnd(http_parser* hp)
+        {
+            HTTPParser* httpParser = (HTTPParser*)hp->data;
+            httpParser->mISCompleted = true;
+            return 0;
+        }
+
+        static int  sHeadComplete(http_parser* hp)
+        {
+            HTTPParser* httpParser = (HTTPParser*)hp->data;
+            if (!httpParser->mCurrentField.empty())
+            {
+                httpParser->mHeadValues[httpParser->mCurrentField] = httpParser->mCurrentValue;
+            }
+
+            if (httpParser->mUrl.empty())
+            {
+                return 0;
+            }
+
+            struct http_parser_url u;
+
+            const int result = http_parser_parse_url(httpParser->mUrl.data(), 
+                httpParser->mUrl.size(), 
+                0, 
+                &u);
+            if (result != 0)
+            {
+                return -1;
+            }
+
+            if (!(u.field_set & (1 << UF_PATH)))
+            {
+                fprintf(stderr, 
+                    "\n\n*** failed to parse PATH in URL %s ***\n\n", 
+                    httpParser->mUrl.c_str());
+                return -1;
+            }
+
+            httpParser->mPath = std::string(
+                httpParser->mUrl.data() + u.field_data[UF_PATH].off, 
+                u.field_data[UF_PATH].len);
+            if (u.field_set & (1 << UF_QUERY))
+            {
+                httpParser->mQuery = std::string(
+                    httpParser->mUrl.data() + u.field_data[UF_QUERY].off, 
+                    u.field_data[UF_QUERY].len);
+            }
+
+            return 0;
+        }
+
+        static int  sUrlHandle(http_parser* hp, const char* url, size_t length)
+        {
+            HTTPParser* httpParser = (HTTPParser*)hp->data;
+            httpParser->mUrl.append(url, length);
+
+            return 0;
+        }
+
+        static int  sHeadValue(http_parser* hp, const char* at, size_t length)
+        {
+            HTTPParser* httpParser = (HTTPParser*)hp->data;
+            httpParser->mCurrentValue.append(at, length);
+            httpParser->mLastWasValue = true;
+            return 0;
+        }
+
+        static int  sHeadField(http_parser* hp, const char* at, size_t length)
+        {
+            HTTPParser* httpParser = (HTTPParser*)hp->data;
+            if (httpParser->mLastWasValue)
+            {
+                if (!httpParser->mCurrentField.empty())
+                {
+                    sHeadComplete(hp);
+                }
+                httpParser->mCurrentField.clear();
+                httpParser->mCurrentValue.clear();
+            }
+
+            httpParser->mCurrentField.append(at, length);
+            httpParser->mLastWasValue = false;
+
+            return 0;
+        }
+
+        static int  sStatusHandle(http_parser* hp, const char* at, size_t length)
+        {
+            HTTPParser* httpParser = (HTTPParser*)hp->data;
+            httpParser->mStatus.append(at, length);
+            httpParser->mStatusCode = hp->status_code;
+            return 0;
+        }
+
+        static int  sBodyHandle(http_parser* hp, const char* at, size_t length)
+        {
+            HTTPParser* httpParser = (HTTPParser*)hp->data;
+            httpParser->mBody.append(at, length);
+            return 0;
+        }
+
+    private:
+        const http_parser_type                  mParserType;
+        http_parser                             mParser;
+        http_parser_settings                    mSettings;
+
+        int                                     mMethod = -1;
+        bool                                    mIsWebSocket;
+        bool                                    mIsKeepAlive;
+        bool                                    mISCompleted;
+
+        bool                                    mLastWasValue;
+        std::string                             mCurrentField;
+        std::string                             mCurrentValue;
+
+        std::string                             mPath;
+        std::string                             mQuery;
+        std::string                             mStatus;
+        std::map<std::string, std::string>      mHeadValues;
+        int                                     mStatusCode;
+
+        std::string                             mUrl;
+        std::string                             mBody;
+
+        std::string                             mWSCacheFrame;
+        std::string                             mWSParsePayload;
+        WebSocketFormat::WebSocketFrameType     mWSFrameType;
+
+    private:
+        friend class HttpService;
+    };
+
+} } }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/HttpService.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/HttpService.hpp
new file mode 100644
index 00000000..671558b1
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/HttpService.hpp
@@ -0,0 +1,345 @@
+#pragma once
+
+#include <memory>
+
+#include <brynet/base/NonCopyable.hpp>
+#include <brynet/base/Any.hpp>
+#include <brynet/net/TcpService.hpp>
+#include <brynet/net/http/HttpParser.hpp>
+#include <brynet/net/http/WebSocketFormat.hpp>
+
+namespace brynet { namespace net { namespace http {
+
+    class HttpService;
+    class HttpSessionHandlers;
+
+    class HttpSession : public brynet::base::NonCopyable
+    {
+    public:
+        using Ptr = std::shared_ptr<HttpSession>;
+
+        using EnterCallback = std::function <void(const HttpSession::Ptr&, HttpSessionHandlers&)>;
+        using HttpParserCallback = std::function <void(const HTTPParser&, const HttpSession::Ptr&)>;
+        using WsCallback =  std::function < void(   const HttpSession::Ptr&,
+                                                    WebSocketFormat::WebSocketFrameType opcode,
+                                                    const std::string& payload)>;
+
+        using ClosedCallback = std::function <void(const HttpSession::Ptr&)>;
+        using WsConnectedCallback = std::function <void(const HttpSession::Ptr&, const HTTPParser&)>;
+
+    public:
+        template<typename PacketType>
+        void                        send(PacketType&& packet,
+            TcpConnection::PacketSendedCallback&& callback = nullptr)
+        {
+            mSession->send(std::forward<TcpConnection::PacketPtr>(packet),
+                std::move(callback));
+        }
+        void                        send(const char* packet,
+            size_t len,
+            TcpConnection::PacketSendedCallback&& callback = nullptr)
+        {
+            mSession->send(packet, len, std::move(callback));
+        }
+
+        void                        postShutdown() const
+        {
+            mSession->postShutdown();
+        }
+
+        void                        postClose() const
+        {
+            mSession->postDisConnect();
+        }
+
+    protected:
+        explicit HttpSession(TcpConnection::Ptr session)
+        {
+            mSession = std::move(session);
+        }
+
+        virtual ~HttpSession() = default;
+
+        static  Ptr                 Create(TcpConnection::Ptr session)
+        {
+            class make_shared_enabler : public HttpSession
+            {
+            public:
+                explicit make_shared_enabler(TcpConnection::Ptr session)
+                    :
+                    HttpSession(std::move(session))
+                    {}
+            };
+            return std::make_shared<make_shared_enabler>(std::move(session));
+        }
+
+        const TcpConnection::Ptr& getSession() const
+        {
+            return mSession;
+        }
+
+        const HttpParserCallback& getHttpCallback() const
+        {
+            return mHttpRequestCallback;
+        }
+
+        const ClosedCallback& getCloseCallback() const
+        {
+            return mCloseCallback;
+        }
+
+        const WsCallback& getWSCallback() const
+        {
+            return mWSCallback;
+        }
+
+        const WsConnectedCallback& getWSConnectedCallback() const
+        {
+            return mWSConnectedCallback;
+        }
+
+    private:
+        void                        setHttpCallback(HttpParserCallback&& callback)
+        {
+            mHttpRequestCallback = std::move(callback);
+        }
+
+        void                        setClosedCallback(ClosedCallback&& callback)
+        {
+            mCloseCallback = std::move(callback);
+        }
+
+        void                        setWSCallback(WsCallback&& callback)
+        {
+            mWSCallback = std::move(callback);
+        }
+
+        void                        setWSConnected(WsConnectedCallback&& callback)
+        {
+            mWSConnectedCallback = std::move(callback);
+        }
+
+    private:
+        TcpConnection::Ptr          mSession;
+        HttpParserCallback          mHttpRequestCallback;
+        WsCallback                  mWSCallback;
+        ClosedCallback              mCloseCallback;
+        WsConnectedCallback         mWSConnectedCallback;
+
+        friend class HttpService;
+    };
+
+    class HttpSessionHandlers
+    {
+    public:
+        void                        setHttpCallback(HttpSession::HttpParserCallback&& callback)
+        {
+            mHttpRequestCallback = std::move(callback);
+        }
+
+        void                        setClosedCallback(HttpSession::ClosedCallback&& callback)
+        {
+            mCloseCallback = std::move(callback);
+        }
+
+        void                        setWSCallback(HttpSession::WsCallback&& callback)
+        {
+            mWSCallback = std::move(callback);
+        }
+
+        void                        setWSConnected(HttpSession::WsConnectedCallback&& callback)
+        {
+            mWSConnectedCallback = std::move(callback);
+        }
+
+    private:
+        HttpSession::HttpParserCallback          mHttpRequestCallback;
+        HttpSession::WsCallback                  mWSCallback;
+        HttpSession::ClosedCallback              mCloseCallback;
+        HttpSession::WsConnectedCallback         mWSConnectedCallback;
+
+        friend class HttpService;
+    };
+
+    class HttpService
+    {
+    public:
+        static void setup(const TcpConnection::Ptr& session, 
+            const HttpSession::EnterCallback& enterCallback)
+        {
+            auto httpSession = HttpSession::Create(session);
+            if (enterCallback != nullptr)
+            {
+                HttpSessionHandlers handlers;
+                enterCallback(httpSession, handlers);
+                httpSession->setHttpCallback(std::move(handlers.mHttpRequestCallback));
+                httpSession->setClosedCallback(std::move(handlers.mCloseCallback));
+                httpSession->setWSCallback(std::move(handlers.mWSCallback));
+                httpSession->setWSConnected(std::move(handlers.mWSConnectedCallback));
+            }
+            HttpService::handle(httpSession);
+        }
+
+    private:
+        static void handle(const HttpSession::Ptr& httpSession)
+        {
+            /*TODO::keep alive and timeout close */
+            auto& session = httpSession->getSession();
+
+            session->setDisConnectCallback([httpSession](const TcpConnection::Ptr&) {
+                const auto& tmp = httpSession->getCloseCallback();
+                if (tmp != nullptr)
+                {
+                    tmp(httpSession);
+                }
+                });
+
+            auto httpParser = std::make_shared<HTTPParser>(HTTP_BOTH);
+            session->setDataCallback([httpSession, httpParser](
+                const char* buffer, size_t len) {
+                    size_t retlen = 0;
+
+                    if (httpParser->isWebSocket())
+                    {
+                        retlen = HttpService::ProcessWebSocket(buffer, 
+                            len, 
+                            httpParser, 
+                            httpSession);
+                    }
+                    else
+                    {
+                        retlen = HttpService::ProcessHttp(buffer, 
+                            len, 
+                            httpParser, 
+                            httpSession);
+                    }
+
+                    return retlen;
+                });
+        }
+
+        static size_t ProcessWebSocket(const char* buffer,
+            size_t len,
+            const HTTPParser::Ptr& httpParser,
+            const HttpSession::Ptr& httpSession)
+        {
+            size_t leftLen = len;
+
+            const auto& wsCallback = httpSession->getWSCallback();
+            auto& cacheFrame = httpParser->getWSCacheFrame();
+            auto& parseString = httpParser->getWSParseString();
+
+            while (leftLen > 0)
+            {
+                parseString.clear();
+
+                auto opcode = WebSocketFormat::WebSocketFrameType::ERROR_FRAME;
+                size_t frameSize = 0;
+                bool isFin = false;
+
+                if (!WebSocketFormat::wsFrameExtractBuffer(buffer, 
+                    leftLen, 
+                    parseString, 
+                    opcode, 
+                    frameSize, 
+                    isFin))
+                {
+                    // 如果没有解�出完整的ws frame则退出函数
+                    break;
+                }
+
+                // 如果当�fram的fin为false或者opcode为延续包
+                // 则将当�frame的payload添加到cache
+                if (!isFin || 
+                    opcode == WebSocketFormat::WebSocketFrameType::CONTINUATION_FRAME)
+                {
+                    cacheFrame += parseString;
+                    parseString.clear();
+                }
+                // 如果当�fram的fin为false，并且opcode�为延续包
+                // 则表示收到分段payload的第一个段(frame)，需�缓存当�frame的opcode
+                if (!isFin && 
+                    opcode != WebSocketFormat::WebSocketFrameType::CONTINUATION_FRAME)
+                {
+                    httpParser->cacheWSFrameType(opcode);
+                }
+
+                leftLen -= frameSize;
+                buffer += frameSize;
+
+                if (!isFin)
+                {
+                    continue;
+                }
+
+                // 如果fin为true，并且opcode为延续包
+                // 则表示分段payload全部接�完毕
+                // 因此需�获�之�第一次收到分段frame的opcode作为整个payload的类型
+                if (opcode == WebSocketFormat::WebSocketFrameType::CONTINUATION_FRAME)
+                {
+                    if (!cacheFrame.empty())
+                    {
+                        parseString = std::move(cacheFrame);
+                        cacheFrame.clear();
+                    }
+                    opcode = httpParser->getWSFrameType();
+                }
+
+                if (wsCallback != nullptr)
+                {
+                    wsCallback(httpSession, opcode, parseString);
+                }
+            }
+
+            return (len - leftLen);
+        }
+
+        static size_t ProcessHttp(const char* buffer,
+            size_t len,
+            const HTTPParser::Ptr& httpParser,
+            const HttpSession::Ptr& httpSession)
+        {
+            size_t retlen = len;
+            if (!httpParser->isCompleted())
+            {
+                retlen = httpParser->tryParse(buffer, len);
+                if (!httpParser->isCompleted())
+                {
+                    return retlen;
+                }
+            }
+
+            if (httpParser->isWebSocket())
+            {
+                if (httpParser->hasKey("Sec-WebSocket-Key"))
+                {
+                    auto response = WebSocketFormat::wsHandshake(
+                        httpParser->getValue("Sec-WebSocket-Key"));
+                    httpSession->send(response.c_str(), 
+                        response.size());
+                }
+
+                const auto& wsConnectedCallback = httpSession->getWSConnectedCallback();
+                if (wsConnectedCallback != nullptr)
+                {
+                    wsConnectedCallback(httpSession, *httpParser);
+                }
+            }
+            else
+            {
+                const auto& httpCallback = httpSession->getHttpCallback();
+                if (httpCallback != nullptr)
+                {
+                    httpCallback(*httpParser, httpSession);
+                }
+                if (httpParser->isKeepAlive())
+                {
+                    httpParser->clearParse();
+                }
+            }
+
+            return retlen;
+        }
+    };
+
+} } }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/WebSocketFormat.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/WebSocketFormat.hpp
new file mode 100644
index 00000000..17a30153
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/WebSocketFormat.hpp
@@ -0,0 +1,239 @@
+#pragma once
+
+#include <string>
+#include <stdint.h>
+#include <random>
+#include <chrono>
+
+#include <brynet/base/crypto/Base64.hpp>
+#include <brynet/base/crypto/SHA1.hpp>
+
+namespace brynet { namespace net { namespace http {
+
+    class WebSocketFormat
+    {
+    public:
+        enum class WebSocketFrameType {
+            ERROR_FRAME = 0xff,
+            CONTINUATION_FRAME = 0x00,
+            TEXT_FRAME = 0x01,
+            BINARY_FRAME = 0x02,
+            CLOSE_FRAME = 0x08,
+            PING_FRAME = 0x09,
+            PONG_FRAME = 0x0A
+        };
+
+        static std::string wsHandshake(std::string secKey)
+        {
+            secKey.append("258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
+
+            CSHA1 s1;
+            s1.Update((unsigned char*)secKey.c_str(), static_cast<unsigned int>(secKey.size()));
+            s1.Final();
+            unsigned char puDest[20];
+            s1.GetHash(puDest);
+
+            std::string base64Str = brynet::base::crypto::base64_encode((const unsigned char*)puDest, 20);
+
+            std::string response = "HTTP/1.1 101 Switching Protocols\r\n"
+                "Upgrade: websocket\r\n"
+                "Connection: Upgrade\r\n"
+                "Sec-WebSocket-Accept: ";
+
+            response += base64Str;
+            response += "\r\n\r\n";
+
+            return response;
+        }
+
+        static bool wsFrameBuild(const char* payload,
+            size_t payloadLen,
+            std::string& frame,
+            WebSocketFrameType frame_type = WebSocketFrameType::TEXT_FRAME,
+            bool isFin = true,
+            bool masking = false)
+        {
+            const auto unixTime = std::chrono::system_clock::now().
+                time_since_epoch().
+                count();
+            static std::mt19937 random(static_cast<unsigned int>(unixTime));
+
+            static_assert(std::is_same<std::string::value_type, char>::value, "");
+
+            const uint8_t head = static_cast<uint8_t>(frame_type) | (isFin ? 0x80 : 0x00);
+
+            frame.clear();
+            frame.push_back(static_cast<char>(head));
+            if (payloadLen <= 125)
+            {
+                // mask << 7 | payloadLen, mask = 0
+                frame.push_back(static_cast<uint8_t>(payloadLen));
+            }
+            else if (payloadLen <= 0xFFFF)
+            {
+                // 126 + 16bit len
+                frame.push_back(126);
+                frame.push_back((payloadLen & 0xFF00) >> 8);
+                frame.push_back(payloadLen & 0x00FF);
+            }
+            else
+            {
+                // 127 + 64bit len
+                frame.push_back(127);
+                // assume payload len is less than u_int32_max
+                frame.push_back(0x00);
+                frame.push_back(0x00);
+                frame.push_back(0x00);
+                frame.push_back(0x00);
+                frame.push_back(static_cast<char>((payloadLen & 0xFF000000) >> 24));
+                frame.push_back(static_cast<char>((payloadLen & 0x00FF0000) >> 16));
+                frame.push_back(static_cast<char>((payloadLen & 0x0000FF00) >> 8));
+                frame.push_back(static_cast<char>(payloadLen & 0x000000FF));
+            }
+
+            if (masking)
+            {
+                frame[1] = ((uint8_t)frame[1]) | 0x80;
+                uint8_t mask[4];
+                for (auto& m : mask)
+                {
+                    m = static_cast<uint8_t>(random());
+                    frame.push_back(m);
+                }
+
+                frame.reserve(frame.size() + payloadLen);
+
+                for (size_t i = 0; i < payloadLen; i++)
+                {
+                    frame.push_back(static_cast<uint8_t>(payload[i]) ^ mask[i % 4]);
+                }
+            }
+            else
+            {
+                frame.append(payload, payloadLen);
+            }
+
+            return true;
+        }
+
+        static bool wsFrameBuild(const std::string& payload,
+            std::string& frame,
+            WebSocketFrameType frame_type = WebSocketFrameType::TEXT_FRAME,
+            bool isFin = true,
+            bool masking = false)
+        {
+            return wsFrameBuild(payload.c_str(), 
+                payload.size(), 
+                frame, 
+                frame_type, 
+                isFin, 
+                masking);
+        }
+
+        static bool wsFrameExtractBuffer(const char* inbuffer,
+            const size_t bufferSize,
+            std::string& payload,
+            WebSocketFrameType& outopcode,
+            size_t& frameSize,
+            bool& outfin)
+        {
+            const auto buffer = (const unsigned char*)inbuffer;
+
+            if (bufferSize < 2)
+            {
+                return false;
+            }
+
+            outfin = (buffer[0] & 0x80) != 0;
+            outopcode = (WebSocketFrameType)(buffer[0] & 0x0F);
+            const bool isMasking = (buffer[1] & 0x80) != 0;
+            uint32_t payloadlen = buffer[1] & 0x7F;
+
+            uint32_t pos = 2;
+            if (payloadlen == 126)
+            {
+                if (bufferSize < 4)
+                {
+                    return false;
+                }
+
+                payloadlen = (buffer[2] << 8) + buffer[3];
+                pos = 4;
+            }
+            else if (payloadlen == 127)
+            {
+                if (bufferSize < 10)
+                {
+                    return false;
+                }
+
+                if (buffer[2] != 0 ||
+                    buffer[3] != 0 ||
+                    buffer[4] != 0 ||
+                    buffer[5] != 0)
+                {
+                    return false;
+                }
+
+                if ((buffer[6] & 0x80) != 0)
+                {
+                    return false;
+                }
+
+                payloadlen = (buffer[6] << 24) + 
+                    (buffer[7] << 16) + 
+                    (buffer[8] << 8) + 
+                    buffer[9];
+                pos = 10;
+            }
+
+            uint8_t mask[4];
+            if (isMasking)
+            {
+                if (bufferSize < (pos + 4))
+                {
+                    return false;
+                }
+
+                mask[0] = buffer[pos++];
+                mask[1] = buffer[pos++];
+                mask[2] = buffer[pos++];
+                mask[3] = buffer[pos++];
+            }
+
+            if (bufferSize < (pos + payloadlen))
+            {
+                return false;
+            }
+
+            if (isMasking)
+            {
+                payload.reserve(payloadlen);
+                for (size_t j = 0; j < payloadlen; j++)
+                    payload.push_back(buffer[pos+j] ^ mask[j % 4]);
+            }
+            else
+            {
+                payload.append((const char*)(buffer + pos), payloadlen);
+            }
+
+            frameSize = payloadlen + pos;
+
+            return true;
+        }
+
+        static bool wsFrameExtractString(const std::string& buffer,
+            std::string& payload,
+            WebSocketFrameType& opcode,
+            size_t& frameSize, bool& isFin)
+        {
+            return wsFrameExtractBuffer(buffer.c_str(), 
+                buffer.size(), 
+                payload, 
+                opcode, 
+                frameSize, 
+                isFin);
+        }
+    };
+
+} } }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/http_parser.h b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/http_parser.h
new file mode 100644
index 00000000..1c03d369
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/http/http_parser.h
@@ -0,0 +1,3206 @@
+/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+#ifndef http_parser_h
+#define http_parser_h
+
+#include <assert.h>
+#include <stddef.h>
+#include <ctype.h>
+#include <string.h>
+#include <limits.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Also update SONAME in the Makefile whenever you change these. */
+#define HTTP_PARSER_VERSION_MAJOR 2
+#define HTTP_PARSER_VERSION_MINOR 9
+#define HTTP_PARSER_VERSION_PATCH 2
+
+#include <stddef.h>
+#if defined(_WIN32) && !defined(__MINGW32__) && \
+  (!defined(_MSC_VER) || _MSC_VER<1600) && !defined(__WINE__)
+#include <BaseTsd.h>
+typedef __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+#include <stdint.h>
+#endif
+
+/* Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run
+ * faster
+ */
+#ifndef HTTP_PARSER_STRICT
+# define HTTP_PARSER_STRICT 1
+#endif
+
+/* Maximium header size allowed. If the macro is not defined
+ * before including this header then the default is used. To
+ * change the maximum header size, define the macro in the build
+ * environment (e.g. -DHTTP_MAX_HEADER_SIZE=<value>). To remove
+ * the effective limit on the size of the header, define the macro
+ * to a very large number (e.g. -DHTTP_MAX_HEADER_SIZE=0x7fffffff)
+ */
+#ifndef HTTP_MAX_HEADER_SIZE
+# define HTTP_MAX_HEADER_SIZE (80*1024)
+#endif
+
+typedef struct http_parser http_parser;
+typedef struct http_parser_settings http_parser_settings;
+
+
+/* Callbacks should return non-zero to indicate an error. The parser will
+ * then halt execution.
+ *
+ * The one exception is on_headers_complete. In a HTTP_RESPONSE parser
+ * returning '1' from on_headers_complete will tell the parser that it
+ * should not expect a body. This is used when receiving a response to a
+ * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
+ * chunked' headers that indicate the presence of a body.
+ *
+ * Returning `2` from on_headers_complete will tell parser that it should not
+ * expect neither a body nor any futher responses on this connection. This is
+ * useful for handling responses to a CONNECT request which may not contain
+ * `Upgrade` or `Connection: upgrade` headers.
+ *
+ * http_data_cb does not return data chunks. It will be called arbitrarily
+ * many times for each string. E.G. you might get 10 callbacks for "on_url"
+ * each providing just a few characters more data.
+ */
+typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);
+typedef int (*http_cb) (http_parser*);
+
+
+/* Status Codes */
+#define HTTP_STATUS_MAP(XX)                                                 \
+  XX(100, CONTINUE,                        Continue)                        \
+  XX(101, SWITCHING_PROTOCOLS,             Switching Protocols)             \
+  XX(102, PROCESSING,                      Processing)                      \
+  XX(200, OK,                              OK)                              \
+  XX(201, CREATED,                         Created)                         \
+  XX(202, ACCEPTED,                        Accepted)                        \
+  XX(203, NON_AUTHORITATIVE_INFORMATION,   Non-Authoritative Information)   \
+  XX(204, NO_CONTENT,                      No Content)                      \
+  XX(205, RESET_CONTENT,                   Reset Content)                   \
+  XX(206, PARTIAL_CONTENT,                 Partial Content)                 \
+  XX(207, MULTI_STATUS,                    Multi-Status)                    \
+  XX(208, ALREADY_REPORTED,                Already Reported)                \
+  XX(226, IM_USED,                         IM Used)                         \
+  XX(300, MULTIPLE_CHOICES,                Multiple Choices)                \
+  XX(301, MOVED_PERMANENTLY,               Moved Permanently)               \
+  XX(302, FOUND,                           Found)                           \
+  XX(303, SEE_OTHER,                       See Other)                       \
+  XX(304, NOT_MODIFIED,                    Not Modified)                    \
+  XX(305, USE_PROXY,                       Use Proxy)                       \
+  XX(307, TEMPORARY_REDIRECT,              Temporary Redirect)              \
+  XX(308, PERMANENT_REDIRECT,              Permanent Redirect)              \
+  XX(400, BAD_REQUEST,                     Bad Request)                     \
+  XX(401, UNAUTHORIZED,                    Unauthorized)                    \
+  XX(402, PAYMENT_REQUIRED,                Payment Required)                \
+  XX(403, FORBIDDEN,                       Forbidden)                       \
+  XX(404, NOT_FOUND,                       Not Found)                       \
+  XX(405, METHOD_NOT_ALLOWED,              Method Not Allowed)              \
+  XX(406, NOT_ACCEPTABLE,                  Not Acceptable)                  \
+  XX(407, PROXY_AUTHENTICATION_REQUIRED,   Proxy Authentication Required)   \
+  XX(408, REQUEST_TIMEOUT,                 Request Timeout)                 \
+  XX(409, CONFLICT,                        Conflict)                        \
+  XX(410, GONE,                            Gone)                            \
+  XX(411, LENGTH_REQUIRED,                 Length Required)                 \
+  XX(412, PRECONDITION_FAILED,             Precondition Failed)             \
+  XX(413, PAYLOAD_TOO_LARGE,               Payload Too Large)               \
+  XX(414, URI_TOO_LONG,                    URI Too Long)                    \
+  XX(415, UNSUPPORTED_MEDIA_TYPE,          Unsupported Media Type)          \
+  XX(416, RANGE_NOT_SATISFIABLE,           Range Not Satisfiable)           \
+  XX(417, EXPECTATION_FAILED,              Expectation Failed)              \
+  XX(421, MISDIRECTED_REQUEST,             Misdirected Request)             \
+  XX(422, UNPROCESSABLE_ENTITY,            Unprocessable Entity)            \
+  XX(423, LOCKED,                          Locked)                          \
+  XX(424, FAILED_DEPENDENCY,               Failed Dependency)               \
+  XX(426, UPGRADE_REQUIRED,                Upgrade Required)                \
+  XX(428, PRECONDITION_REQUIRED,           Precondition Required)           \
+  XX(429, TOO_MANY_REQUESTS,               Too Many Requests)               \
+  XX(431, REQUEST_HEADER_FIELDS_TOO_LARGE, Request Header Fields Too Large) \
+  XX(451, UNAVAILABLE_FOR_LEGAL_REASONS,   Unavailable For Legal Reasons)   \
+  XX(500, INTERNAL_SERVER_ERROR,           Internal Server Error)           \
+  XX(501, NOT_IMPLEMENTED,                 Not Implemented)                 \
+  XX(502, BAD_GATEWAY,                     Bad Gateway)                     \
+  XX(503, SERVICE_UNAVAILABLE,             Service Unavailable)             \
+  XX(504, GATEWAY_TIMEOUT,                 Gateway Timeout)                 \
+  XX(505, HTTP_VERSION_NOT_SUPPORTED,      HTTP Version Not Supported)      \
+  XX(506, VARIANT_ALSO_NEGOTIATES,         Variant Also Negotiates)         \
+  XX(507, INSUFFICIENT_STORAGE,            Insufficient Storage)            \
+  XX(508, LOOP_DETECTED,                   Loop Detected)                   \
+  XX(510, NOT_EXTENDED,                    Not Extended)                    \
+  XX(511, NETWORK_AUTHENTICATION_REQUIRED, Network Authentication Required) \
+
+enum http_status
+  {
+#define XX(num, name, string) HTTP_STATUS_##name = num,
+  HTTP_STATUS_MAP(XX)
+#undef XX
+  };
+
+
+/* Request Methods */
+#define HTTP_METHOD_MAP(XX)         \
+  XX(0,  DELETE,      DELETE)       \
+  XX(1,  GET,         GET)          \
+  XX(2,  HEAD,        HEAD)         \
+  XX(3,  POST,        POST)         \
+  XX(4,  PUT,         PUT)          \
+  /* pathological */                \
+  XX(5,  CONNECT,     CONNECT)      \
+  XX(6,  OPTIONS,     OPTIONS)      \
+  XX(7,  TRACE,       TRACE)        \
+  /* WebDAV */                      \
+  XX(8,  COPY,        COPY)         \
+  XX(9,  LOCK,        LOCK)         \
+  XX(10, MKCOL,       MKCOL)        \
+  XX(11, MOVE,        MOVE)         \
+  XX(12, PROPFIND,    PROPFIND)     \
+  XX(13, PROPPATCH,   PROPPATCH)    \
+  XX(14, SEARCH,      SEARCH)       \
+  XX(15, UNLOCK,      UNLOCK)       \
+  XX(16, BIND,        BIND)         \
+  XX(17, REBIND,      REBIND)       \
+  XX(18, UNBIND,      UNBIND)       \
+  XX(19, ACL,         ACL)          \
+  /* subversion */                  \
+  XX(20, REPORT,      REPORT)       \
+  XX(21, MKACTIVITY,  MKACTIVITY)   \
+  XX(22, CHECKOUT,    CHECKOUT)     \
+  XX(23, MERGE,       MERGE)        \
+  /* upnp */                        \
+  XX(24, MSEARCH,     M-SEARCH)     \
+  XX(25, NOTIFY,      NOTIFY)       \
+  XX(26, SUBSCRIBE,   SUBSCRIBE)    \
+  XX(27, UNSUBSCRIBE, UNSUBSCRIBE)  \
+  /* RFC-5789 */                    \
+  XX(28, PATCH,       PATCH)        \
+  XX(29, PURGE,       PURGE)        \
+  /* CalDAV */                      \
+  XX(30, MKCALENDAR,  MKCALENDAR)   \
+  /* RFC-2068, section 19.6.1.2 */  \
+  XX(31, LINK,        LINK)         \
+  XX(32, UNLINK,      UNLINK)       \
+  /* icecast */                     \
+  XX(33, SOURCE,      SOURCE)       \
+
+enum http_method
+  {
+#define XX(num, name, string) HTTP_##name = num,
+  HTTP_METHOD_MAP(XX)
+#undef XX
+  };
+
+
+enum http_parser_type { HTTP_REQUEST, HTTP_RESPONSE, HTTP_BOTH };
+
+
+/* Flag values for http_parser.flags field */
+enum flags
+  { F_CHUNKED               = 1 << 0
+  , F_CONNECTION_KEEP_ALIVE = 1 << 1
+  , F_CONNECTION_CLOSE      = 1 << 2
+  , F_CONNECTION_UPGRADE    = 1 << 3
+  , F_TRAILING              = 1 << 4
+  , F_UPGRADE               = 1 << 5
+  , F_SKIPBODY              = 1 << 6
+  , F_CONTENTLENGTH         = 1 << 7
+  };
+
+
+/* Map for errno-related constants
+ *
+ * The provided argument should be a macro that takes 2 arguments.
+ */
+#define HTTP_ERRNO_MAP(XX)                                           \
+  /* No error */                                                     \
+  XX(OK, "success")                                                  \
+                                                                     \
+  /* Callback-related errors */                                      \
+  XX(CB_message_begin, "the on_message_begin callback failed")       \
+  XX(CB_url, "the on_url callback failed")                           \
+  XX(CB_header_field, "the on_header_field callback failed")         \
+  XX(CB_header_value, "the on_header_value callback failed")         \
+  XX(CB_headers_complete, "the on_headers_complete callback failed") \
+  XX(CB_body, "the on_body callback failed")                         \
+  XX(CB_message_complete, "the on_message_complete callback failed") \
+  XX(CB_status, "the on_status callback failed")                     \
+  XX(CB_chunk_header, "the on_chunk_header callback failed")         \
+  XX(CB_chunk_complete, "the on_chunk_complete callback failed")     \
+                                                                     \
+  /* Parsing-related errors */                                       \
+  XX(INVALID_EOF_STATE, "stream ended at an unexpected time")        \
+  XX(HEADER_OVERFLOW,                                                \
+     "too many header bytes seen; overflow detected")                \
+  XX(CLOSED_CONNECTION,                                              \
+     "data received after completed connection: close message")      \
+  XX(INVALID_VERSION, "invalid HTTP version")                        \
+  XX(INVALID_STATUS, "invalid HTTP status code")                     \
+  XX(INVALID_METHOD, "invalid HTTP method")                          \
+  XX(INVALID_URL, "invalid URL")                                     \
+  XX(INVALID_HOST, "invalid host")                                   \
+  XX(INVALID_PORT, "invalid port")                                   \
+  XX(INVALID_PATH, "invalid path")                                   \
+  XX(INVALID_QUERY_STRING, "invalid query string")                   \
+  XX(INVALID_FRAGMENT, "invalid fragment")                           \
+  XX(LF_EXPECTED, "LF character expected")                           \
+  XX(INVALID_HEADER_TOKEN, "invalid character in header")            \
+  XX(INVALID_CONTENT_LENGTH,                                         \
+     "invalid character in content-length header")                   \
+  XX(UNEXPECTED_CONTENT_LENGTH,                                      \
+     "unexpected content-length header")                             \
+  XX(INVALID_CHUNK_SIZE,                                             \
+     "invalid character in chunk size header")                       \
+  XX(INVALID_CONSTANT, "invalid constant string")                    \
+  XX(INVALID_INTERNAL_STATE, "encountered unexpected internal state")\
+  XX(STRICT, "strict mode assertion failed")                         \
+  XX(PAUSED, "parser is paused")                                     \
+  XX(UNKNOWN, "an unknown error occurred")
+
+
+/* Define HPE_* values for each errno value above */
+#define HTTP_ERRNO_GEN(n, s) HPE_##n,
+enum http_errno {
+  HTTP_ERRNO_MAP(HTTP_ERRNO_GEN)
+};
+#undef HTTP_ERRNO_GEN
+
+
+/* Get an http_errno value from an http_parser */
+#define HTTP_PARSER_ERRNO(p)            ((enum http_errno) (p)->http_errno)
+
+
+struct http_parser {
+  /** PRIVATE **/
+  unsigned int type : 2;         /* enum http_parser_type */
+  unsigned int flags : 8;        /* F_* values from 'flags' enum; semi-public */
+  unsigned int state : 7;        /* enum state from http_parser.c */
+  unsigned int header_state : 7; /* enum header_state from http_parser.c */
+  unsigned int index : 7;        /* index into current matcher */
+  unsigned int lenient_http_headers : 1;
+
+  uint32_t nread;          /* # bytes read in various scenarios */
+  uint64_t content_length; /* # bytes in body (0 if no Content-Length header) */
+
+  /** READ-ONLY **/
+  unsigned short http_major;
+  unsigned short http_minor;
+  unsigned int status_code : 16; /* responses only */
+  unsigned int method : 8;       /* requests only */
+  unsigned int http_errno : 7;
+
+  /* 1 = Upgrade header was present and the parser has exited because of that.
+   * 0 = No upgrade header present.
+   * Should be checked when http_parser_execute() returns in addition to
+   * error checking.
+   */
+  unsigned int upgrade : 1;
+
+  /** PUBLIC **/
+  void *data; /* A pointer to get hook to the "connection" or "socket" object */
+};
+
+
+struct http_parser_settings {
+  http_cb      on_message_begin;
+  http_data_cb on_url;
+  http_data_cb on_status;
+  http_data_cb on_header_field;
+  http_data_cb on_header_value;
+  http_cb      on_headers_complete;
+  http_data_cb on_body;
+  http_cb      on_message_complete;
+  /* When on_chunk_header is called, the current chunk length is stored
+   * in parser->content_length.
+   */
+  http_cb      on_chunk_header;
+  http_cb      on_chunk_complete;
+};
+
+
+enum http_parser_url_fields
+  { UF_SCHEMA           = 0
+  , UF_HOST             = 1
+  , UF_PORT             = 2
+  , UF_PATH             = 3
+  , UF_QUERY            = 4
+  , UF_FRAGMENT         = 5
+  , UF_USERINFO         = 6
+  , UF_MAX              = 7
+  };
+
+
+/* Result structure for http_parser_parse_url().
+ *
+ * Callers should index into field_data[] with UF_* values iff field_set
+ * has the relevant (1 << UF_*) bit set. As a courtesy to clients (and
+ * because we probably have padding left over), we convert any port to
+ * a uint16_t.
+ */
+struct http_parser_url {
+  uint16_t field_set;           /* Bitmask of (1 << UF_*) values */
+  uint16_t port;                /* Converted UF_PORT string */
+
+  struct {
+    uint16_t off;               /* Offset into buffer in which field starts */
+    uint16_t len;               /* Length of run in buffer */
+  } field_data[UF_MAX];
+};
+
+
+/* Returns the library version. Bits 16-23 contain the major version number,
+ * bits 8-15 the minor version number and bits 0-7 the patch level.
+ * Usage example:
+ *
+ *   unsigned long version = http_parser_version();
+ *   unsigned major = (version >> 16) & 255;
+ *   unsigned minor = (version >> 8) & 255;
+ *   unsigned patch = version & 255;
+ *   printf("http_parser v%u.%u.%u\n", major, minor, patch);
+ */
+static unsigned long http_parser_version(void);
+
+static void http_parser_init(http_parser *parser, enum http_parser_type type);
+
+
+/* Initialize http_parser_settings members to 0
+ */
+static void http_parser_settings_init(http_parser_settings *settings);
+
+
+/* Executes the parser. Returns number of parsed bytes. Sets
+ * `parser->http_errno` on error. */
+static size_t http_parser_execute(http_parser *parser,
+                           const http_parser_settings *settings,
+                           const char *data,
+                           size_t len);
+
+
+/* If http_should_keep_alive() in the on_headers_complete or
+ * on_message_complete callback returns 0, then this should be
+ * the last message on the connection.
+ * If you are the server, respond with the "Connection: close" header.
+ * If you are the client, close the connection.
+ */
+static int http_should_keep_alive(const http_parser *parser);
+
+/* Returns a string version of the HTTP method. */
+static const char *http_method_str(enum http_method m);
+
+/* Returns a string version of the HTTP status code. */
+static const char *http_status_str(enum http_status s);
+
+/* Return a string name of the given error */
+static const char *http_errno_name(enum http_errno err);
+
+/* Return a string description of the given error */
+static const char *http_errno_description(enum http_errno err);
+
+/* Initialize all http_parser_url members to 0 */
+static void http_parser_url_init(struct http_parser_url *u);
+
+/* Parse a URL; return nonzero on failure */
+static int http_parser_parse_url(const char *buf, size_t buflen,
+                          int is_connect,
+                          struct http_parser_url *u);
+
+/* Pause or un-pause the parser; a nonzero value pauses */
+static void http_parser_pause(http_parser *parser, int paused);
+
+/* Checks if this is the final chunk of the body. */
+static int http_body_is_final(const http_parser *parser);
+
+/* Change the maximum header size provided at compile time. */
+static void http_parser_set_max_header_size(uint32_t size);
+
+static uint32_t max_header_size = HTTP_MAX_HEADER_SIZE;
+
+#ifndef ULLONG_MAX
+#define ULLONG_MAX ((uint64_t)-1) /* 2^64-1 */
+#endif
+
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+#endif
+
+#ifndef BIT_AT
+#define BIT_AT(a, i)                              \
+  (!!((unsigned int)(a)[(unsigned int)(i) >> 3] & \
+      (1 << ((unsigned int)(i)&7))))
+#endif
+
+#ifndef ELEM_AT
+#define ELEM_AT(a, i, v) ((unsigned int)(i) < ARRAY_SIZE(a) ? (a)[(i)] : (v))
+#endif
+
+#define SET_ERRNO(e)          \
+  do                          \
+  {                           \
+    parser->nread = nread;    \
+    parser->http_errno = (e); \
+  } while (0)
+
+#define CURRENT_STATE() p_state
+#define UPDATE_STATE(V) p_state = (enum state)(V);
+#define RETURN(V)                    \
+  do                                 \
+  {                                  \
+    parser->nread = nread;           \
+    parser->state = CURRENT_STATE(); \
+    return (V);                      \
+  } while (0);
+#define REEXECUTE() \
+  goto reexecute;
+
+#ifdef __GNUC__
+#define LIKELY(X) __builtin_expect(!!(X), 1)
+#define UNLIKELY(X) __builtin_expect(!!(X), 0)
+#else
+#define LIKELY(X) (X)
+#define UNLIKELY(X) (X)
+#endif
+
+/* Run the notify callback FOR, returning ER if it fails */
+#define CALLBACK_NOTIFY_(FOR, ER)                          \
+  do                                                       \
+  {                                                        \
+    assert(HTTP_PARSER_ERRNO(parser) == HPE_OK);           \
+                                                           \
+    if (LIKELY(settings->on_##FOR))                        \
+    {                                                      \
+      parser->state = CURRENT_STATE();                     \
+      if (UNLIKELY(0 != settings->on_##FOR(parser)))       \
+      {                                                    \
+        SET_ERRNO(HPE_CB_##FOR);                           \
+      }                                                    \
+      UPDATE_STATE(parser->state);                         \
+                                                           \
+      /* We either errored above or got paused; get out */ \
+      if (UNLIKELY(HTTP_PARSER_ERRNO(parser) != HPE_OK))   \
+      {                                                    \
+        return (ER);                                       \
+      }                                                    \
+    }                                                      \
+  } while (0)
+
+/* Run the notify callback FOR and consume the current byte */
+#define CALLBACK_NOTIFY(FOR) CALLBACK_NOTIFY_(FOR, p - data + 1)
+
+/* Run the notify callback FOR and don't consume the current byte */
+#define CALLBACK_NOTIFY_NOADVANCE(FOR) CALLBACK_NOTIFY_(FOR, p - data)
+
+/* Run data callback FOR with LEN bytes, returning ER if it fails */
+#define CALLBACK_DATA_(FOR, LEN, ER)                                 \
+  do                                                                 \
+  {                                                                  \
+    assert(HTTP_PARSER_ERRNO(parser) == HPE_OK);                     \
+                                                                     \
+    if (FOR##_mark)                                                  \
+    {                                                                \
+      if (LIKELY(settings->on_##FOR))                                \
+      {                                                              \
+        parser->state = CURRENT_STATE();                             \
+        if (UNLIKELY(0 !=                                            \
+                     settings->on_##FOR(parser, FOR##_mark, (LEN)))) \
+        {                                                            \
+          SET_ERRNO(HPE_CB_##FOR);                                   \
+        }                                                            \
+        UPDATE_STATE(parser->state);                                 \
+                                                                     \
+        /* We either errored above or got paused; get out */         \
+        if (UNLIKELY(HTTP_PARSER_ERRNO(parser) != HPE_OK))           \
+        {                                                            \
+          return (ER);                                               \
+        }                                                            \
+      }                                                              \
+      FOR##_mark = NULL;                                             \
+    }                                                                \
+  } while (0)
+
+/* Run the data callback FOR and consume the current byte */
+#define CALLBACK_DATA(FOR) \
+  CALLBACK_DATA_(FOR, p - FOR##_mark, p - data + 1)
+
+/* Run the data callback FOR and don't consume the current byte */
+#define CALLBACK_DATA_NOADVANCE(FOR) \
+  CALLBACK_DATA_(FOR, p - FOR##_mark, p - data)
+
+/* Set the mark FOR; non-destructive if mark is already set */
+#define MARK(FOR)     \
+  do                  \
+  {                   \
+    if (!FOR##_mark)  \
+    {                 \
+      FOR##_mark = p; \
+    }                 \
+  } while (0)
+
+/* Don't allow the total size of the HTTP headers (including the status
+ * line) to exceed max_header_size.  This check is here to protect
+ * embedders against denial-of-service attacks where the attacker feeds
+ * us a never-ending header that the embedder keeps buffering.
+ *
+ * This check is arguably the responsibility of embedders but we're doing
+ * it on the embedder's behalf because most won't bother and this way we
+ * make the web a little safer.  max_header_size is still far bigger
+ * than any reasonable request or response so this should never affect
+ * day-to-day operation.
+ */
+#define COUNT_HEADER_SIZE(V)               \
+  do                                       \
+  {                                        \
+    nread += (uint32_t)(V);                \
+    if (UNLIKELY(nread > max_header_size)) \
+    {                                      \
+      SET_ERRNO(HPE_HEADER_OVERFLOW);      \
+      goto error;                          \
+    }                                      \
+  } while (0)
+
+#define PROXY_CONNECTION "proxy-connection"
+#define CONNECTION "connection"
+#define CONTENT_LENGTH "content-length"
+#define TRANSFER_ENCODING "transfer-encoding"
+#define UPGRADE "upgrade"
+#define CHUNKED "chunked"
+#define KEEP_ALIVE "keep-alive"
+#define CLOSE "close"
+
+  static const char *method_strings[] =
+      {
+#define XX(num, name, string) #string,
+          HTTP_METHOD_MAP(XX)
+#undef XX
+  };
+
+  /* Tokens as defined by rfc 2616. Also lowercases them.
+ *        token       = 1*<any CHAR except CTLs or separators>
+ *     separators     = "(" | ")" | "<" | ">" | "@"
+ *                    | "," | ";" | ":" | "\" | <">
+ *                    | "/" | "[" | "]" | "?" | "="
+ *                    | "{" | "}" | SP | HT
+ */
+  static const char tokens[256] = {
+      /*   0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel  */
+      0, 0, 0, 0, 0, 0, 0, 0,
+      /*   8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si   */
+      0, 0, 0, 0, 0, 0, 0, 0,
+      /*  16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb */
+      0, 0, 0, 0, 0, 0, 0, 0,
+      /*  24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us  */
+      0, 0, 0, 0, 0, 0, 0, 0,
+      /*  32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  '  */
+      ' ', '!', 0, '#', '$', '%', '&', '\'',
+      /*  40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  /  */
+      0, 0, '*', '+', 0, '-', '.', 0,
+      /*  48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7  */
+      '0', '1', '2', '3', '4', '5', '6', '7',
+      /*  56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ?  */
+      '8', '9', 0, 0, 0, 0, 0, 0,
+      /*  64  @    65  A    66  B    67  C    68  D    69  E    70  F    71  G  */
+      0, 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+      /*  72  H    73  I    74  J    75  K    76  L    77  M    78  N    79  O  */
+      'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+      /*  80  P    81  Q    82  R    83  S    84  T    85  U    86  V    87  W  */
+      'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
+      /*  88  X    89  Y    90  Z    91  [    92  \    93  ]    94  ^    95  _  */
+      'x', 'y', 'z', 0, 0, 0, '^', '_',
+      /*  96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g  */
+      '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+      /* 104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o  */
+      'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+      /* 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w  */
+      'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
+      /* 120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del */
+      'x', 'y', 'z', 0, '|', 0, '~', 0};
+
+  static const int8_t unhex[256] =
+      {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+
+#if HTTP_PARSER_STRICT
+#define T(v) 0
+#else
+#define T(v) v
+#endif
+
+  static const uint8_t normal_url_char[32] = {
+      /*   0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel  */
+      0 | 0 | 0 | 0 | 0 | 0 | 0 | 0,
+      /*   8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si   */
+      0 | T(2) | 0 | 0 | T(16) | 0 | 0 | 0,
+      /*  16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb */
+      0 | 0 | 0 | 0 | 0 | 0 | 0 | 0,
+      /*  24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us  */
+      0 | 0 | 0 | 0 | 0 | 0 | 0 | 0,
+      /*  32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  '  */
+      0 | 2 | 4 | 0 | 16 | 32 | 64 | 128,
+      /*  40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  /  */
+      1 | 2 | 4 | 8 | 16 | 32 | 64 | 128,
+      /*  48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7  */
+      1 | 2 | 4 | 8 | 16 | 32 | 64 | 128,
+      /*  56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ?  */
+      1 | 2 | 4 | 8 | 16 | 32 | 64 | 0,
+      /*  64  @    65  A    66  B    67  C    68  D    69  E    70  F    71  G  */
+      1 | 2 | 4 | 8 | 16 | 32 | 64 | 128,
+      /*  72  H    73  I    74  J    75  K    76  L    77  M    78  N    79  O  */
+      1 | 2 | 4 | 8 | 16 | 32 | 64 | 128,
+      /*  80  P    81  Q    82  R    83  S    84  T    85  U    86  V    87  W  */
+      1 | 2 | 4 | 8 | 16 | 32 | 64 | 128,
+      /*  88  X    89  Y    90  Z    91  [    92  \    93  ]    94  ^    95  _  */
+      1 | 2 | 4 | 8 | 16 | 32 | 64 | 128,
+      /*  96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g  */
+      1 | 2 | 4 | 8 | 16 | 32 | 64 | 128,
+      /* 104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o  */
+      1 | 2 | 4 | 8 | 16 | 32 | 64 | 128,
+      /* 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w  */
+      1 | 2 | 4 | 8 | 16 | 32 | 64 | 128,
+      /* 120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del */
+      1 | 2 | 4 | 8 | 16 | 32 | 64 | 0,
+  };
+
+#undef T
+
+  enum state
+  {
+    s_dead = 1 /* important that this is > 0 */
+
+    ,
+    s_start_req_or_res,
+    s_res_or_resp_H,
+    s_start_res,
+    s_res_H,
+    s_res_HT,
+    s_res_HTT,
+    s_res_HTTP,
+    s_res_http_major,
+    s_res_http_dot,
+    s_res_http_minor,
+    s_res_http_end,
+    s_res_first_status_code,
+    s_res_status_code,
+    s_res_status_start,
+    s_res_status,
+    s_res_line_almost_done
+
+    ,
+    s_start_req
+
+    ,
+    s_req_method,
+    s_req_spaces_before_url,
+    s_req_schema,
+    s_req_schema_slash,
+    s_req_schema_slash_slash,
+    s_req_server_start,
+    s_req_server,
+    s_req_server_with_at,
+    s_req_path,
+    s_req_query_string_start,
+    s_req_query_string,
+    s_req_fragment_start,
+    s_req_fragment,
+    s_req_http_start,
+    s_req_http_H,
+    s_req_http_HT,
+    s_req_http_HTT,
+    s_req_http_HTTP,
+    s_req_http_I,
+    s_req_http_IC,
+    s_req_http_major,
+    s_req_http_dot,
+    s_req_http_minor,
+    s_req_http_end,
+    s_req_line_almost_done
+
+    ,
+    s_header_field_start,
+    s_header_field,
+    s_header_value_discard_ws,
+    s_header_value_discard_ws_almost_done,
+    s_header_value_discard_lws,
+    s_header_value_start,
+    s_header_value,
+    s_header_value_lws
+
+    ,
+    s_header_almost_done
+
+    ,
+    s_chunk_size_start,
+    s_chunk_size,
+    s_chunk_parameters,
+    s_chunk_size_almost_done
+
+    ,
+    s_headers_almost_done,
+    s_headers_done
+
+    /* Important: 's_headers_done' must be the last 'header' state. All
+   * states beyond this must be 'body' states. It is used for overflow
+   * checking. See the PARSING_HEADER() macro.
+   */
+
+    ,
+    s_chunk_data,
+    s_chunk_data_almost_done,
+    s_chunk_data_done
+
+    ,
+    s_body_identity,
+    s_body_identity_eof
+
+    ,
+    s_message_done
+  };
+
+#define PARSING_HEADER(state) (state <= s_headers_done)
+
+  enum header_states
+  {
+    h_general = 0,
+    h_C,
+    h_CO,
+    h_CON
+
+    ,
+    h_matching_connection,
+    h_matching_proxy_connection,
+    h_matching_content_length,
+    h_matching_transfer_encoding,
+    h_matching_upgrade
+
+    ,
+    h_connection,
+    h_content_length,
+    h_content_length_num,
+    h_content_length_ws,
+    h_transfer_encoding,
+    h_upgrade
+
+    ,
+    h_matching_transfer_encoding_chunked,
+    h_matching_connection_token_start,
+    h_matching_connection_keep_alive,
+    h_matching_connection_close,
+    h_matching_connection_upgrade,
+    h_matching_connection_token
+
+    ,
+    h_transfer_encoding_chunked,
+    h_connection_keep_alive,
+    h_connection_close,
+    h_connection_upgrade
+  };
+
+  enum http_host_state
+  {
+    s_http_host_dead = 1,
+    s_http_userinfo_start,
+    s_http_userinfo,
+    s_http_host_start,
+    s_http_host_v6_start,
+    s_http_host,
+    s_http_host_v6,
+    s_http_host_v6_end,
+    s_http_host_v6_zone_start,
+    s_http_host_v6_zone,
+    s_http_host_port_start,
+    s_http_host_port
+  };
+
+/* Macros for character classes; depends on strict-mode  */
+#define CR '\r'
+#define LF '\n'
+#define LOWER(c) (unsigned char)(c | 0x20)
+#define IS_ALPHA(c) (LOWER(c) >= 'a' && LOWER(c) <= 'z')
+#define IS_NUM(c) ((c) >= '0' && (c) <= '9')
+#define IS_ALPHANUM(c) (IS_ALPHA(c) || IS_NUM(c))
+#define IS_HEX(c) (IS_NUM(c) || (LOWER(c) >= 'a' && LOWER(c) <= 'f'))
+#define IS_MARK(c) ((c) == '-' || (c) == '_' || (c) == '.' ||                              \
+                    (c) == '!' || (c) == '~' || (c) == '*' || (c) == '\'' || (c) == '(' || \
+                    (c) == ')')
+#define IS_USERINFO_CHAR(c) (IS_ALPHANUM(c) || IS_MARK(c) || (c) == '%' ||                         \
+                             (c) == ';' || (c) == ':' || (c) == '&' || (c) == '=' || (c) == '+' || \
+                             (c) == '$' || (c) == ',')
+
+#define STRICT_TOKEN(c) ((c == ' ') ? 0 : tokens[(unsigned char)c])
+
+#if HTTP_PARSER_STRICT
+#define TOKEN(c) STRICT_TOKEN(c)
+#define IS_URL_CHAR(c) (BIT_AT(normal_url_char, (unsigned char)c))
+#define IS_HOST_CHAR(c) (IS_ALPHANUM(c) || (c) == '.' || (c) == '-')
+#else
+#define TOKEN(c) tokens[(unsigned char)c]
+#define IS_URL_CHAR(c) \
+  (BIT_AT(normal_url_char, (unsigned char)c) || ((c)&0x80))
+#define IS_HOST_CHAR(c) \
+  (IS_ALPHANUM(c) || (c) == '.' || (c) == '-' || (c) == '_')
+#endif
+
+/**
+ * Verify that a char is a valid visible (printable) US-ASCII
+ * character or %x80-FF
+ **/
+#define IS_HEADER_CHAR(ch) \
+  (ch == CR || ch == LF || ch == 9 || ((unsigned char)ch > 31 && ch != 127))
+
+#define start_state (parser->type == HTTP_REQUEST ? s_start_req : s_start_res)
+
+#if HTTP_PARSER_STRICT
+#define STRICT_CHECK(cond)   \
+  do                         \
+  {                          \
+    if (cond)                \
+    {                        \
+      SET_ERRNO(HPE_STRICT); \
+      goto error;            \
+    }                        \
+  } while (0)
+#define NEW_MESSAGE() (http_should_keep_alive(parser) ? start_state : s_dead)
+#else
+#define STRICT_CHECK(cond)
+#define NEW_MESSAGE() start_state
+#endif
+
+/* Map errno values to strings for human-readable output */
+#define HTTP_STRERROR_GEN(n, s) {"HPE_" #n, s},
+  static struct
+  {
+    const char *name;
+    const char *description;
+  } http_strerror_tab[] = {
+      HTTP_ERRNO_MAP(HTTP_STRERROR_GEN)};
+#undef HTTP_STRERROR_GEN
+
+  static int http_message_needs_eof(const http_parser *parser);
+
+  /* Our URL parser.
+ *
+ * This is designed to be shared by http_parser_execute() for URL validation,
+ * hence it has a state transition + byte-for-byte interface. In addition, it
+ * is meant to be embedded in http_parser_parse_url(), which does the dirty
+ * work of turning state transitions URL components for its API.
+ *
+ * This function should only be invoked with non-space characters. It is
+ * assumed that the caller cares about (and can detect) the transition between
+ * URL and non-URL states by looking for these.
+ */
+  static enum state
+  parse_url_char(enum state s, const char ch)
+  {
+    if (ch == ' ' || ch == '\r' || ch == '\n')
+    {
+      return s_dead;
+    }
+
+#if HTTP_PARSER_STRICT
+    if (ch == '\t' || ch == '\f')
+    {
+      return s_dead;
+    }
+#endif
+
+    switch (s)
+    {
+    case s_req_spaces_before_url:
+      /* Proxied requests are followed by scheme of an absolute URI (alpha).
+       * All methods except CONNECT are followed by '/' or '*'.
+       */
+
+      if (ch == '/' || ch == '*')
+      {
+        return s_req_path;
+      }
+
+      if (IS_ALPHA(ch))
+      {
+        return s_req_schema;
+      }
+
+      break;
+
+    case s_req_schema:
+      if (IS_ALPHA(ch))
+      {
+        return s;
+      }
+
+      if (ch == ':')
+      {
+        return s_req_schema_slash;
+      }
+
+      break;
+
+    case s_req_schema_slash:
+      if (ch == '/')
+      {
+        return s_req_schema_slash_slash;
+      }
+
+      break;
+
+    case s_req_schema_slash_slash:
+      if (ch == '/')
+      {
+        return s_req_server_start;
+      }
+
+      break;
+
+    case s_req_server_with_at:
+      if (ch == '@')
+      {
+        return s_dead;
+      }
+
+    /* fall through */
+    case s_req_server_start:
+    case s_req_server:
+      if (ch == '/')
+      {
+        return s_req_path;
+      }
+
+      if (ch == '?')
+      {
+        return s_req_query_string_start;
+      }
+
+      if (ch == '@')
+      {
+        return s_req_server_with_at;
+      }
+
+      if (IS_USERINFO_CHAR(ch) || ch == '[' || ch == ']')
+      {
+        return s_req_server;
+      }
+
+      break;
+
+    case s_req_path:
+      if (IS_URL_CHAR(ch))
+      {
+        return s;
+      }
+
+      switch (ch)
+      {
+      case '?':
+        return s_req_query_string_start;
+
+      case '#':
+        return s_req_fragment_start;
+      }
+
+      break;
+
+    case s_req_query_string_start:
+    case s_req_query_string:
+      if (IS_URL_CHAR(ch))
+      {
+        return s_req_query_string;
+      }
+
+      switch (ch)
+      {
+      case '?':
+        /* allow extra '?' in query string */
+        return s_req_query_string;
+
+      case '#':
+        return s_req_fragment_start;
+      }
+
+      break;
+
+    case s_req_fragment_start:
+      if (IS_URL_CHAR(ch))
+      {
+        return s_req_fragment;
+      }
+
+      switch (ch)
+      {
+      case '?':
+        return s_req_fragment;
+
+      case '#':
+        return s;
+      }
+
+      break;
+
+    case s_req_fragment:
+      if (IS_URL_CHAR(ch))
+      {
+        return s;
+      }
+
+      switch (ch)
+      {
+      case '?':
+      case '#':
+        return s;
+      }
+
+      break;
+
+    default:
+      break;
+    }
+
+    /* We should never fall out of the switch above unless there's an error */
+    return s_dead;
+  }
+
+  static size_t http_parser_execute(http_parser *parser,
+                             const http_parser_settings *settings,
+                             const char *data,
+                             size_t len)
+  {
+    char c, ch;
+    int8_t unhex_val;
+    const char *p = data;
+    const char *header_field_mark = 0;
+    const char *header_value_mark = 0;
+    const char *url_mark = 0;
+    const char *body_mark = 0;
+    const char *status_mark = 0;
+    enum state p_state = (enum state)parser->state;
+    const unsigned int lenient = parser->lenient_http_headers;
+    uint32_t nread = parser->nread;
+
+    /* We're in an error state. Don't bother doing anything. */
+    if (HTTP_PARSER_ERRNO(parser) != HPE_OK)
+    {
+      return 0;
+    }
+
+    if (len == 0)
+    {
+      switch (CURRENT_STATE())
+      {
+      case s_body_identity_eof:
+        /* Use of CALLBACK_NOTIFY() here would erroneously return 1 byte read if
+         * we got paused.
+         */
+        CALLBACK_NOTIFY_NOADVANCE(message_complete);
+        return 0;
+
+      case s_dead:
+      case s_start_req_or_res:
+      case s_start_res:
+      case s_start_req:
+        return 0;
+
+      default:
+        SET_ERRNO(HPE_INVALID_EOF_STATE);
+        return 1;
+      }
+    }
+
+    if (CURRENT_STATE() == s_header_field)
+      header_field_mark = data;
+    if (CURRENT_STATE() == s_header_value)
+      header_value_mark = data;
+    switch (CURRENT_STATE())
+    {
+    case s_req_path:
+    case s_req_schema:
+    case s_req_schema_slash:
+    case s_req_schema_slash_slash:
+    case s_req_server_start:
+    case s_req_server:
+    case s_req_server_with_at:
+    case s_req_query_string_start:
+    case s_req_query_string:
+    case s_req_fragment_start:
+    case s_req_fragment:
+      url_mark = data;
+      break;
+    case s_res_status:
+      status_mark = data;
+      break;
+    default:
+      break;
+    }
+
+    for (p = data; p != data + len; p++)
+    {
+      ch = *p;
+
+      if (PARSING_HEADER(CURRENT_STATE()))
+        COUNT_HEADER_SIZE(1);
+
+    reexecute:
+      switch (CURRENT_STATE())
+      {
+
+      case s_dead:
+        /* this state is used after a 'Connection: close' message
+         * the parser will error out if it reads another message
+         */
+        if (LIKELY(ch == CR || ch == LF))
+          break;
+
+        SET_ERRNO(HPE_CLOSED_CONNECTION);
+        goto error;
+
+      case s_start_req_or_res:
+      {
+        if (ch == CR || ch == LF)
+          break;
+        parser->flags = 0;
+        parser->content_length = ULLONG_MAX;
+
+        if (ch == 'H')
+        {
+          UPDATE_STATE(s_res_or_resp_H);
+
+          CALLBACK_NOTIFY(message_begin);
+        }
+        else
+        {
+          parser->type = HTTP_REQUEST;
+          UPDATE_STATE(s_start_req);
+          REEXECUTE();
+        }
+
+        break;
+      }
+
+      case s_res_or_resp_H:
+        if (ch == 'T')
+        {
+          parser->type = HTTP_RESPONSE;
+          UPDATE_STATE(s_res_HT);
+        }
+        else
+        {
+          if (UNLIKELY(ch != 'E'))
+          {
+            SET_ERRNO(HPE_INVALID_CONSTANT);
+            goto error;
+          }
+
+          parser->type = HTTP_REQUEST;
+          parser->method = HTTP_HEAD;
+          parser->index = 2;
+          UPDATE_STATE(s_req_method);
+        }
+        break;
+
+      case s_start_res:
+      {
+        if (ch == CR || ch == LF)
+          break;
+        parser->flags = 0;
+        parser->content_length = ULLONG_MAX;
+
+        if (ch == 'H')
+        {
+          UPDATE_STATE(s_res_H);
+        }
+        else
+        {
+          SET_ERRNO(HPE_INVALID_CONSTANT);
+          goto error;
+        }
+
+        CALLBACK_NOTIFY(message_begin);
+        break;
+      }
+
+      case s_res_H:
+        STRICT_CHECK(ch != 'T');
+        UPDATE_STATE(s_res_HT);
+        break;
+
+      case s_res_HT:
+        STRICT_CHECK(ch != 'T');
+        UPDATE_STATE(s_res_HTT);
+        break;
+
+      case s_res_HTT:
+        STRICT_CHECK(ch != 'P');
+        UPDATE_STATE(s_res_HTTP);
+        break;
+
+      case s_res_HTTP:
+        STRICT_CHECK(ch != '/');
+        UPDATE_STATE(s_res_http_major);
+        break;
+
+      case s_res_http_major:
+        if (UNLIKELY(!IS_NUM(ch)))
+        {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->http_major = ch - '0';
+        UPDATE_STATE(s_res_http_dot);
+        break;
+
+      case s_res_http_dot:
+      {
+        if (UNLIKELY(ch != '.'))
+        {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        UPDATE_STATE(s_res_http_minor);
+        break;
+      }
+
+      case s_res_http_minor:
+        if (UNLIKELY(!IS_NUM(ch)))
+        {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->http_minor = ch - '0';
+        UPDATE_STATE(s_res_http_end);
+        break;
+
+      case s_res_http_end:
+      {
+        if (UNLIKELY(ch != ' '))
+        {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        UPDATE_STATE(s_res_first_status_code);
+        break;
+      }
+
+      case s_res_first_status_code:
+      {
+        if (!IS_NUM(ch))
+        {
+          if (ch == ' ')
+          {
+            break;
+          }
+
+          SET_ERRNO(HPE_INVALID_STATUS);
+          goto error;
+        }
+        parser->status_code = ch - '0';
+        UPDATE_STATE(s_res_status_code);
+        break;
+      }
+
+      case s_res_status_code:
+      {
+        if (!IS_NUM(ch))
+        {
+          switch (ch)
+          {
+          case ' ':
+            UPDATE_STATE(s_res_status_start);
+            break;
+          case CR:
+          case LF:
+            UPDATE_STATE(s_res_status_start);
+            REEXECUTE();
+            break;
+          default:
+            SET_ERRNO(HPE_INVALID_STATUS);
+            goto error;
+          }
+          break;
+        }
+
+        parser->status_code *= 10;
+        parser->status_code += ch - '0';
+
+        if (UNLIKELY(parser->status_code > 999))
+        {
+          SET_ERRNO(HPE_INVALID_STATUS);
+          goto error;
+        }
+
+        break;
+      }
+
+      case s_res_status_start:
+      {
+        MARK(status);
+        UPDATE_STATE(s_res_status);
+        parser->index = 0;
+
+        if (ch == CR || ch == LF)
+          REEXECUTE();
+
+        break;
+      }
+
+      case s_res_status:
+        if (ch == CR)
+        {
+          UPDATE_STATE(s_res_line_almost_done);
+          CALLBACK_DATA(status);
+          break;
+        }
+
+        if (ch == LF)
+        {
+          UPDATE_STATE(s_header_field_start);
+          CALLBACK_DATA(status);
+          break;
+        }
+
+        break;
+
+      case s_res_line_almost_done:
+        STRICT_CHECK(ch != LF);
+        UPDATE_STATE(s_header_field_start);
+        break;
+
+      case s_start_req:
+      {
+        if (ch == CR || ch == LF)
+          break;
+        parser->flags = 0;
+        parser->content_length = ULLONG_MAX;
+
+        if (UNLIKELY(!IS_ALPHA(ch)))
+        {
+          SET_ERRNO(HPE_INVALID_METHOD);
+          goto error;
+        }
+
+        parser->method = (enum http_method)0;
+        parser->index = 1;
+        switch (ch)
+        {
+        case 'A':
+          parser->method = HTTP_ACL;
+          break;
+        case 'B':
+          parser->method = HTTP_BIND;
+          break;
+        case 'C':
+          parser->method = HTTP_CONNECT; /* or COPY, CHECKOUT */
+          break;
+        case 'D':
+          parser->method = HTTP_DELETE;
+          break;
+        case 'G':
+          parser->method = HTTP_GET;
+          break;
+        case 'H':
+          parser->method = HTTP_HEAD;
+          break;
+        case 'L':
+          parser->method = HTTP_LOCK; /* or LINK */
+          break;
+        case 'M':
+          parser->method = HTTP_MKCOL; /* or MOVE, MKACTIVITY, MERGE, M-SEARCH, MKCALENDAR */
+          break;
+        case 'N':
+          parser->method = HTTP_NOTIFY;
+          break;
+        case 'O':
+          parser->method = HTTP_OPTIONS;
+          break;
+        case 'P':
+          parser->method = HTTP_POST;
+          /* or PROPFIND|PROPPATCH|PUT|PATCH|PURGE */
+          break;
+        case 'R':
+          parser->method = HTTP_REPORT; /* or REBIND */
+          break;
+        case 'S':
+          parser->method = HTTP_SUBSCRIBE; /* or SEARCH, SOURCE */
+          break;
+        case 'T':
+          parser->method = HTTP_TRACE;
+          break;
+        case 'U':
+          parser->method = HTTP_UNLOCK; /* or UNSUBSCRIBE, UNBIND, UNLINK */
+          break;
+        default:
+          SET_ERRNO(HPE_INVALID_METHOD);
+          goto error;
+        }
+        UPDATE_STATE(s_req_method);
+
+        CALLBACK_NOTIFY(message_begin);
+
+        break;
+      }
+
+      case s_req_method:
+      {
+        const char *matcher;
+        if (UNLIKELY(ch == '\0'))
+        {
+          SET_ERRNO(HPE_INVALID_METHOD);
+          goto error;
+        }
+
+        matcher = method_strings[parser->method];
+        if (ch == ' ' && matcher[parser->index] == '\0')
+        {
+          UPDATE_STATE(s_req_spaces_before_url);
+        }
+        else if (ch == matcher[parser->index])
+        {
+          ; /* nada */
+        }
+        else if ((ch >= 'A' && ch <= 'Z') || ch == '-')
+        {
+
+          switch (parser->method << 16 | parser->index << 8 | ch)
+          {
+#define XX(meth, pos, ch, new_meth)         \
+  case (HTTP_##meth << 16 | pos << 8 | ch): \
+    parser->method = HTTP_##new_meth;       \
+    break;
+
+            XX(POST, 1, 'U', PUT)
+            XX(POST, 1, 'A', PATCH)
+            XX(POST, 1, 'R', PROPFIND)
+            XX(PUT, 2, 'R', PURGE)
+            XX(CONNECT, 1, 'H', CHECKOUT)
+            XX(CONNECT, 2, 'P', COPY)
+            XX(MKCOL, 1, 'O', MOVE)
+            XX(MKCOL, 1, 'E', MERGE)
+            XX(MKCOL, 1, '-', MSEARCH)
+            XX(MKCOL, 2, 'A', MKACTIVITY)
+            XX(MKCOL, 3, 'A', MKCALENDAR)
+            XX(SUBSCRIBE, 1, 'E', SEARCH)
+            XX(SUBSCRIBE, 1, 'O', SOURCE)
+            XX(REPORT, 2, 'B', REBIND)
+            XX(PROPFIND, 4, 'P', PROPPATCH)
+            XX(LOCK, 1, 'I', LINK)
+            XX(UNLOCK, 2, 'S', UNSUBSCRIBE)
+            XX(UNLOCK, 2, 'B', UNBIND)
+            XX(UNLOCK, 3, 'I', UNLINK)
+#undef XX
+          default:
+            SET_ERRNO(HPE_INVALID_METHOD);
+            goto error;
+          }
+        }
+        else
+        {
+          SET_ERRNO(HPE_INVALID_METHOD);
+          goto error;
+        }
+
+        ++parser->index;
+        break;
+      }
+
+      case s_req_spaces_before_url:
+      {
+        if (ch == ' ')
+          break;
+
+        MARK(url);
+        if (parser->method == HTTP_CONNECT)
+        {
+          UPDATE_STATE(s_req_server_start);
+        }
+
+        UPDATE_STATE(parse_url_char(CURRENT_STATE(), ch));
+        if (UNLIKELY(CURRENT_STATE() == s_dead))
+        {
+          SET_ERRNO(HPE_INVALID_URL);
+          goto error;
+        }
+
+        break;
+      }
+
+      case s_req_schema:
+      case s_req_schema_slash:
+      case s_req_schema_slash_slash:
+      case s_req_server_start:
+      {
+        switch (ch)
+        {
+        /* No whitespace allowed here */
+        case ' ':
+        case CR:
+        case LF:
+          SET_ERRNO(HPE_INVALID_URL);
+          goto error;
+        default:
+          UPDATE_STATE(parse_url_char(CURRENT_STATE(), ch));
+          if (UNLIKELY(CURRENT_STATE() == s_dead))
+          {
+            SET_ERRNO(HPE_INVALID_URL);
+            goto error;
+          }
+        }
+
+        break;
+      }
+
+      case s_req_server:
+      case s_req_server_with_at:
+      case s_req_path:
+      case s_req_query_string_start:
+      case s_req_query_string:
+      case s_req_fragment_start:
+      case s_req_fragment:
+      {
+        switch (ch)
+        {
+        case ' ':
+          UPDATE_STATE(s_req_http_start);
+          CALLBACK_DATA(url);
+          break;
+        case CR:
+        case LF:
+          parser->http_major = 0;
+          parser->http_minor = 9;
+          UPDATE_STATE((ch == CR) ? s_req_line_almost_done : s_header_field_start);
+          CALLBACK_DATA(url);
+          break;
+        default:
+          UPDATE_STATE(parse_url_char(CURRENT_STATE(), ch));
+          if (UNLIKELY(CURRENT_STATE() == s_dead))
+          {
+            SET_ERRNO(HPE_INVALID_URL);
+            goto error;
+          }
+        }
+        break;
+      }
+
+      case s_req_http_start:
+        switch (ch)
+        {
+        case ' ':
+          break;
+        case 'H':
+          UPDATE_STATE(s_req_http_H);
+          break;
+        case 'I':
+          if (parser->method == HTTP_SOURCE)
+          {
+            UPDATE_STATE(s_req_http_I);
+            break;
+          }
+          /* fall through */
+        default:
+          SET_ERRNO(HPE_INVALID_CONSTANT);
+          goto error;
+        }
+        break;
+
+      case s_req_http_H:
+        STRICT_CHECK(ch != 'T');
+        UPDATE_STATE(s_req_http_HT);
+        break;
+
+      case s_req_http_HT:
+        STRICT_CHECK(ch != 'T');
+        UPDATE_STATE(s_req_http_HTT);
+        break;
+
+      case s_req_http_HTT:
+        STRICT_CHECK(ch != 'P');
+        UPDATE_STATE(s_req_http_HTTP);
+        break;
+
+      case s_req_http_I:
+        STRICT_CHECK(ch != 'C');
+        UPDATE_STATE(s_req_http_IC);
+        break;
+
+      case s_req_http_IC:
+        STRICT_CHECK(ch != 'E');
+        UPDATE_STATE(s_req_http_HTTP); /* Treat "ICE" as "HTTP". */
+        break;
+
+      case s_req_http_HTTP:
+        STRICT_CHECK(ch != '/');
+        UPDATE_STATE(s_req_http_major);
+        break;
+
+      case s_req_http_major:
+        if (UNLIKELY(!IS_NUM(ch)))
+        {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->http_major = ch - '0';
+        UPDATE_STATE(s_req_http_dot);
+        break;
+
+      case s_req_http_dot:
+      {
+        if (UNLIKELY(ch != '.'))
+        {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        UPDATE_STATE(s_req_http_minor);
+        break;
+      }
+
+      case s_req_http_minor:
+        if (UNLIKELY(!IS_NUM(ch)))
+        {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->http_minor = ch - '0';
+        UPDATE_STATE(s_req_http_end);
+        break;
+
+      case s_req_http_end:
+      {
+        if (ch == CR)
+        {
+          UPDATE_STATE(s_req_line_almost_done);
+          break;
+        }
+
+        if (ch == LF)
+        {
+          UPDATE_STATE(s_header_field_start);
+          break;
+        }
+
+        SET_ERRNO(HPE_INVALID_VERSION);
+        goto error;
+        break;
+      }
+
+      /* end of request line */
+      case s_req_line_almost_done:
+      {
+        if (UNLIKELY(ch != LF))
+        {
+          SET_ERRNO(HPE_LF_EXPECTED);
+          goto error;
+        }
+
+        UPDATE_STATE(s_header_field_start);
+        break;
+      }
+
+      case s_header_field_start:
+      {
+        if (ch == CR)
+        {
+          UPDATE_STATE(s_headers_almost_done);
+          break;
+        }
+
+        if (ch == LF)
+        {
+          /* they might be just sending \n instead of \r\n so this would be
+           * the second \n to denote the end of headers*/
+          UPDATE_STATE(s_headers_almost_done);
+          REEXECUTE();
+        }
+
+        c = TOKEN(ch);
+
+        if (UNLIKELY(!c))
+        {
+          SET_ERRNO(HPE_INVALID_HEADER_TOKEN);
+          goto error;
+        }
+
+        MARK(header_field);
+
+        parser->index = 0;
+        UPDATE_STATE(s_header_field);
+
+        switch (c)
+        {
+        case 'c':
+          parser->header_state = h_C;
+          break;
+
+        case 'p':
+          parser->header_state = h_matching_proxy_connection;
+          break;
+
+        case 't':
+          parser->header_state = h_matching_transfer_encoding;
+          break;
+
+        case 'u':
+          parser->header_state = h_matching_upgrade;
+          break;
+
+        default:
+          parser->header_state = h_general;
+          break;
+        }
+        break;
+      }
+
+      case s_header_field:
+      {
+        const char *start = p;
+        for (; p != data + len; p++)
+        {
+          ch = *p;
+          c = TOKEN(ch);
+
+          if (!c)
+            break;
+
+          switch (parser->header_state)
+          {
+          case h_general:
+          {
+            size_t left = data + len - p;
+            const char *pe = p + MIN(left, max_header_size);
+            while (p + 1 < pe && TOKEN(p[1]))
+            {
+              p++;
+            }
+            break;
+          }
+
+          case h_C:
+            parser->index++;
+            parser->header_state = (c == 'o' ? h_CO : h_general);
+            break;
+
+          case h_CO:
+            parser->index++;
+            parser->header_state = (c == 'n' ? h_CON : h_general);
+            break;
+
+          case h_CON:
+            parser->index++;
+            switch (c)
+            {
+            case 'n':
+              parser->header_state = h_matching_connection;
+              break;
+            case 't':
+              parser->header_state = h_matching_content_length;
+              break;
+            default:
+              parser->header_state = h_general;
+              break;
+            }
+            break;
+
+            /* connection */
+
+          case h_matching_connection:
+            parser->index++;
+            if (parser->index > sizeof(CONNECTION) - 1 || c != CONNECTION[parser->index])
+            {
+              parser->header_state = h_general;
+            }
+            else if (parser->index == sizeof(CONNECTION) - 2)
+            {
+              parser->header_state = h_connection;
+            }
+            break;
+
+            /* proxy-connection */
+
+          case h_matching_proxy_connection:
+            parser->index++;
+            if (parser->index > sizeof(PROXY_CONNECTION) - 1 || c != PROXY_CONNECTION[parser->index])
+            {
+              parser->header_state = h_general;
+            }
+            else if (parser->index == sizeof(PROXY_CONNECTION) - 2)
+            {
+              parser->header_state = h_connection;
+            }
+            break;
+
+            /* content-length */
+
+          case h_matching_content_length:
+            parser->index++;
+            if (parser->index > sizeof(CONTENT_LENGTH) - 1 || c != CONTENT_LENGTH[parser->index])
+            {
+              parser->header_state = h_general;
+            }
+            else if (parser->index == sizeof(CONTENT_LENGTH) - 2)
+            {
+              parser->header_state = h_content_length;
+            }
+            break;
+
+            /* transfer-encoding */
+
+          case h_matching_transfer_encoding:
+            parser->index++;
+            if (parser->index > sizeof(TRANSFER_ENCODING) - 1 || c != TRANSFER_ENCODING[parser->index])
+            {
+              parser->header_state = h_general;
+            }
+            else if (parser->index == sizeof(TRANSFER_ENCODING) - 2)
+            {
+              parser->header_state = h_transfer_encoding;
+            }
+            break;
+
+            /* upgrade */
+
+          case h_matching_upgrade:
+            parser->index++;
+            if (parser->index > sizeof(UPGRADE) - 1 || c != UPGRADE[parser->index])
+            {
+              parser->header_state = h_general;
+            }
+            else if (parser->index == sizeof(UPGRADE) - 2)
+            {
+              parser->header_state = h_upgrade;
+            }
+            break;
+
+          case h_connection:
+          case h_content_length:
+          case h_transfer_encoding:
+          case h_upgrade:
+            if (ch != ' ')
+              parser->header_state = h_general;
+            break;
+
+          default:
+            assert(0 && "Unknown header_state");
+            break;
+          }
+        }
+
+        if (p == data + len)
+        {
+          --p;
+          COUNT_HEADER_SIZE(p - start);
+          break;
+        }
+
+        COUNT_HEADER_SIZE(p - start);
+
+        if (ch == ':')
+        {
+          UPDATE_STATE(s_header_value_discard_ws);
+          CALLBACK_DATA(header_field);
+          break;
+        }
+
+        SET_ERRNO(HPE_INVALID_HEADER_TOKEN);
+        goto error;
+      }
+
+      case s_header_value_discard_ws:
+        if (ch == ' ' || ch == '\t')
+          break;
+
+        if (ch == CR)
+        {
+          UPDATE_STATE(s_header_value_discard_ws_almost_done);
+          break;
+        }
+
+        if (ch == LF)
+        {
+          UPDATE_STATE(s_header_value_discard_lws);
+          break;
+        }
+
+        /* fall through */
+
+      case s_header_value_start:
+      {
+        MARK(header_value);
+
+        UPDATE_STATE(s_header_value);
+        parser->index = 0;
+
+        c = LOWER(ch);
+
+        switch (parser->header_state)
+        {
+        case h_upgrade:
+          parser->flags |= F_UPGRADE;
+          parser->header_state = h_general;
+          break;
+
+        case h_transfer_encoding:
+          /* looking for 'Transfer-Encoding: chunked' */
+          if ('c' == c)
+          {
+            parser->header_state = h_matching_transfer_encoding_chunked;
+          }
+          else
+          {
+            parser->header_state = h_general;
+          }
+          break;
+
+        case h_content_length:
+          if (UNLIKELY(!IS_NUM(ch)))
+          {
+            SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
+            goto error;
+          }
+
+          if (parser->flags & F_CONTENTLENGTH)
+          {
+            SET_ERRNO(HPE_UNEXPECTED_CONTENT_LENGTH);
+            goto error;
+          }
+
+          parser->flags |= F_CONTENTLENGTH;
+          parser->content_length = ch - '0';
+          parser->header_state = h_content_length_num;
+          break;
+
+        /* when obsolete line folding is encountered for content length
+           * continue to the s_header_value state */
+        case h_content_length_ws:
+          break;
+
+        case h_connection:
+          /* looking for 'Connection: keep-alive' */
+          if (c == 'k')
+          {
+            parser->header_state = h_matching_connection_keep_alive;
+            /* looking for 'Connection: close' */
+          }
+          else if (c == 'c')
+          {
+            parser->header_state = h_matching_connection_close;
+          }
+          else if (c == 'u')
+          {
+            parser->header_state = h_matching_connection_upgrade;
+          }
+          else
+          {
+            parser->header_state = h_matching_connection_token;
+          }
+          break;
+
+        /* Multi-value `Connection` header */
+        case h_matching_connection_token_start:
+          break;
+
+        default:
+          parser->header_state = h_general;
+          break;
+        }
+        break;
+      }
+
+      case s_header_value:
+      {
+        const char *start = p;
+        enum header_states h_state = (enum header_states)parser->header_state;
+        for (; p != data + len; p++)
+        {
+          ch = *p;
+          if (ch == CR)
+          {
+            UPDATE_STATE(s_header_almost_done);
+            parser->header_state = h_state;
+            CALLBACK_DATA(header_value);
+            break;
+          }
+
+          if (ch == LF)
+          {
+            UPDATE_STATE(s_header_almost_done);
+            COUNT_HEADER_SIZE(p - start);
+            parser->header_state = h_state;
+            CALLBACK_DATA_NOADVANCE(header_value);
+            REEXECUTE();
+          }
+
+          if (!lenient && !IS_HEADER_CHAR(ch))
+          {
+            SET_ERRNO(HPE_INVALID_HEADER_TOKEN);
+            goto error;
+          }
+
+          c = LOWER(ch);
+
+          switch (h_state)
+          {
+          case h_general:
+          {
+            size_t left = data + len - p;
+            const char *pe = p + MIN(left, max_header_size);
+
+            for (; p != pe; p++)
+            {
+              ch = *p;
+              if (ch == CR || ch == LF)
+              {
+                --p;
+                break;
+              }
+              if (!lenient && !IS_HEADER_CHAR(ch))
+              {
+                SET_ERRNO(HPE_INVALID_HEADER_TOKEN);
+                goto error;
+              }
+            }
+            if (p == data + len)
+              --p;
+            break;
+          }
+
+          case h_connection:
+          case h_transfer_encoding:
+            assert(0 && "Shouldn't get here.");
+            break;
+
+          case h_content_length:
+            if (ch == ' ')
+              break;
+            h_state = h_content_length_num;
+            /* fall through */
+
+          case h_content_length_num:
+          {
+            uint64_t t;
+
+            if (ch == ' ')
+            {
+              h_state = h_content_length_ws;
+              break;
+            }
+
+            if (UNLIKELY(!IS_NUM(ch)))
+            {
+              SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
+              parser->header_state = h_state;
+              goto error;
+            }
+
+            t = parser->content_length;
+            t *= 10;
+            t += ch - '0';
+
+            /* Overflow? Test against a conservative limit for simplicity. */
+            if (UNLIKELY((ULLONG_MAX - 10) / 10 < parser->content_length))
+            {
+              SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
+              parser->header_state = h_state;
+              goto error;
+            }
+
+            parser->content_length = t;
+            break;
+          }
+
+          case h_content_length_ws:
+            if (ch == ' ')
+              break;
+            SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
+            parser->header_state = h_state;
+            goto error;
+
+          /* Transfer-Encoding: chunked */
+          case h_matching_transfer_encoding_chunked:
+            parser->index++;
+            if (parser->index > sizeof(CHUNKED) - 1 || c != CHUNKED[parser->index])
+            {
+              h_state = h_general;
+            }
+            else if (parser->index == sizeof(CHUNKED) - 2)
+            {
+              h_state = h_transfer_encoding_chunked;
+            }
+            break;
+
+          case h_matching_connection_token_start:
+            /* looking for 'Connection: keep-alive' */
+            if (c == 'k')
+            {
+              h_state = h_matching_connection_keep_alive;
+              /* looking for 'Connection: close' */
+            }
+            else if (c == 'c')
+            {
+              h_state = h_matching_connection_close;
+            }
+            else if (c == 'u')
+            {
+              h_state = h_matching_connection_upgrade;
+            }
+            else if (STRICT_TOKEN(c))
+            {
+              h_state = h_matching_connection_token;
+            }
+            else if (c == ' ' || c == '\t')
+            {
+              /* Skip lws */
+            }
+            else
+            {
+              h_state = h_general;
+            }
+            break;
+
+          /* looking for 'Connection: keep-alive' */
+          case h_matching_connection_keep_alive:
+            parser->index++;
+            if (parser->index > sizeof(KEEP_ALIVE) - 1 || c != KEEP_ALIVE[parser->index])
+            {
+              h_state = h_matching_connection_token;
+            }
+            else if (parser->index == sizeof(KEEP_ALIVE) - 2)
+            {
+              h_state = h_connection_keep_alive;
+            }
+            break;
+
+          /* looking for 'Connection: close' */
+          case h_matching_connection_close:
+            parser->index++;
+            if (parser->index > sizeof(CLOSE) - 1 || c != CLOSE[parser->index])
+            {
+              h_state = h_matching_connection_token;
+            }
+            else if (parser->index == sizeof(CLOSE) - 2)
+            {
+              h_state = h_connection_close;
+            }
+            break;
+
+          /* looking for 'Connection: upgrade' */
+          case h_matching_connection_upgrade:
+            parser->index++;
+            if (parser->index > sizeof(UPGRADE) - 1 ||
+                c != UPGRADE[parser->index])
+            {
+              h_state = h_matching_connection_token;
+            }
+            else if (parser->index == sizeof(UPGRADE) - 2)
+            {
+              h_state = h_connection_upgrade;
+            }
+            break;
+
+          case h_matching_connection_token:
+            if (ch == ',')
+            {
+              h_state = h_matching_connection_token_start;
+              parser->index = 0;
+            }
+            break;
+
+          case h_transfer_encoding_chunked:
+            if (ch != ' ')
+              h_state = h_general;
+            break;
+
+          case h_connection_keep_alive:
+          case h_connection_close:
+          case h_connection_upgrade:
+            if (ch == ',')
+            {
+              if (h_state == h_connection_keep_alive)
+              {
+                parser->flags |= F_CONNECTION_KEEP_ALIVE;
+              }
+              else if (h_state == h_connection_close)
+              {
+                parser->flags |= F_CONNECTION_CLOSE;
+              }
+              else if (h_state == h_connection_upgrade)
+              {
+                parser->flags |= F_CONNECTION_UPGRADE;
+              }
+              h_state = h_matching_connection_token_start;
+              parser->index = 0;
+            }
+            else if (ch != ' ')
+            {
+              h_state = h_matching_connection_token;
+            }
+            break;
+
+          default:
+            UPDATE_STATE(s_header_value);
+            h_state = h_general;
+            break;
+          }
+        }
+        parser->header_state = h_state;
+
+        if (p == data + len)
+          --p;
+
+        COUNT_HEADER_SIZE(p - start);
+        break;
+      }
+
+      case s_header_almost_done:
+      {
+        if (UNLIKELY(ch != LF))
+        {
+          SET_ERRNO(HPE_LF_EXPECTED);
+          goto error;
+        }
+
+        UPDATE_STATE(s_header_value_lws);
+        break;
+      }
+
+      case s_header_value_lws:
+      {
+        if (ch == ' ' || ch == '\t')
+        {
+          if (parser->header_state == h_content_length_num)
+          {
+            /* treat obsolete line folding as space */
+            parser->header_state = h_content_length_ws;
+          }
+          UPDATE_STATE(s_header_value_start);
+          REEXECUTE();
+        }
+
+        /* finished the header */
+        switch (parser->header_state)
+        {
+        case h_connection_keep_alive:
+          parser->flags |= F_CONNECTION_KEEP_ALIVE;
+          break;
+        case h_connection_close:
+          parser->flags |= F_CONNECTION_CLOSE;
+          break;
+        case h_transfer_encoding_chunked:
+          parser->flags |= F_CHUNKED;
+          break;
+        case h_connection_upgrade:
+          parser->flags |= F_CONNECTION_UPGRADE;
+          break;
+        default:
+          break;
+        }
+
+        UPDATE_STATE(s_header_field_start);
+        REEXECUTE();
+      }
+
+      case s_header_value_discard_ws_almost_done:
+      {
+        STRICT_CHECK(ch != LF);
+        UPDATE_STATE(s_header_value_discard_lws);
+        break;
+      }
+
+      case s_header_value_discard_lws:
+      {
+        if (ch == ' ' || ch == '\t')
+        {
+          UPDATE_STATE(s_header_value_discard_ws);
+          break;
+        }
+        else
+        {
+          switch (parser->header_state)
+          {
+          case h_connection_keep_alive:
+            parser->flags |= F_CONNECTION_KEEP_ALIVE;
+            break;
+          case h_connection_close:
+            parser->flags |= F_CONNECTION_CLOSE;
+            break;
+          case h_connection_upgrade:
+            parser->flags |= F_CONNECTION_UPGRADE;
+            break;
+          case h_transfer_encoding_chunked:
+            parser->flags |= F_CHUNKED;
+            break;
+          case h_content_length:
+            /* do not allow empty content length */
+            SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
+            goto error;
+            break;
+          default:
+            break;
+          }
+
+          /* header value was empty */
+          MARK(header_value);
+          UPDATE_STATE(s_header_field_start);
+          CALLBACK_DATA_NOADVANCE(header_value);
+          REEXECUTE();
+        }
+      }
+
+      case s_headers_almost_done:
+      {
+        STRICT_CHECK(ch != LF);
+
+        if (parser->flags & F_TRAILING)
+        {
+          /* End of a chunked request */
+          UPDATE_STATE(s_message_done);
+          CALLBACK_NOTIFY_NOADVANCE(chunk_complete);
+          REEXECUTE();
+        }
+
+        /* Cannot use chunked encoding and a content-length header together
+           per the HTTP specification. */
+        if ((parser->flags & F_CHUNKED) &&
+            (parser->flags & F_CONTENTLENGTH))
+        {
+          SET_ERRNO(HPE_UNEXPECTED_CONTENT_LENGTH);
+          goto error;
+        }
+
+        UPDATE_STATE(s_headers_done);
+
+        /* Set this here so that on_headers_complete() callbacks can see it */
+        if ((parser->flags & F_UPGRADE) &&
+            (parser->flags & F_CONNECTION_UPGRADE))
+        {
+          /* For responses, "Upgrade: foo" and "Connection: upgrade" are
+           * mandatory only when it is a 101 Switching Protocols response,
+           * otherwise it is purely informational, to announce support.
+           */
+          parser->upgrade =
+              (parser->type == HTTP_REQUEST || parser->status_code == 101);
+        }
+        else
+        {
+          parser->upgrade = (parser->method == HTTP_CONNECT);
+        }
+
+        /* Here we call the headers_complete callback. This is somewhat
+         * different than other callbacks because if the user returns 1, we
+         * will interpret that as saying that this message has no body. This
+         * is needed for the annoying case of recieving a response to a HEAD
+         * request.
+         *
+         * We'd like to use CALLBACK_NOTIFY_NOADVANCE() here but we cannot, so
+         * we have to simulate it by handling a change in errno below.
+         */
+        if (settings->on_headers_complete)
+        {
+          switch (settings->on_headers_complete(parser))
+          {
+          case 0:
+            break;
+
+          case 2:
+            parser->upgrade = 1;
+
+            /* fall through */
+          case 1:
+            parser->flags |= F_SKIPBODY;
+            break;
+
+          default:
+            SET_ERRNO(HPE_CB_headers_complete);
+            RETURN(p - data); /* Error */
+          }
+        }
+
+        if (HTTP_PARSER_ERRNO(parser) != HPE_OK)
+        {
+          RETURN(p - data);
+        }
+
+        REEXECUTE();
+      }
+
+      case s_headers_done:
+      {
+        int hasBody;
+        STRICT_CHECK(ch != LF);
+
+        parser->nread = 0;
+        nread = 0;
+
+        hasBody = parser->flags & F_CHUNKED ||
+                  (parser->content_length > 0 && parser->content_length != ULLONG_MAX);
+        if (parser->upgrade && (parser->method == HTTP_CONNECT ||
+                                (parser->flags & F_SKIPBODY) || !hasBody))
+        {
+          /* Exit, the rest of the message is in a different protocol. */
+          UPDATE_STATE(NEW_MESSAGE());
+          CALLBACK_NOTIFY(message_complete);
+          RETURN((p - data) + 1);
+        }
+
+        if (parser->flags & F_SKIPBODY)
+        {
+          UPDATE_STATE(NEW_MESSAGE());
+          CALLBACK_NOTIFY(message_complete);
+        }
+        else if (parser->flags & F_CHUNKED)
+        {
+          /* chunked encoding - ignore Content-Length header */
+          UPDATE_STATE(s_chunk_size_start);
+        }
+        else
+        {
+          if (parser->content_length == 0)
+          {
+            /* Content-Length header given but zero: Content-Length: 0\r\n */
+            UPDATE_STATE(NEW_MESSAGE());
+            CALLBACK_NOTIFY(message_complete);
+          }
+          else if (parser->content_length != ULLONG_MAX)
+          {
+            /* Content-Length header given and non-zero */
+            UPDATE_STATE(s_body_identity);
+          }
+          else
+          {
+            if (!http_message_needs_eof(parser))
+            {
+              /* Assume content-length 0 - read the next */
+              UPDATE_STATE(NEW_MESSAGE());
+              CALLBACK_NOTIFY(message_complete);
+            }
+            else
+            {
+              /* Read body until EOF */
+              UPDATE_STATE(s_body_identity_eof);
+            }
+          }
+        }
+
+        break;
+      }
+
+      case s_body_identity:
+      {
+        uint64_t to_read = MIN(parser->content_length,
+                               (uint64_t)((data + len) - p));
+
+        assert(parser->content_length != 0 && parser->content_length != ULLONG_MAX);
+
+        /* The difference between advancing content_length and p is because
+         * the latter will automaticaly advance on the next loop iteration.
+         * Further, if content_length ends up at 0, we want to see the last
+         * byte again for our message complete callback.
+         */
+        MARK(body);
+        parser->content_length -= to_read;
+        p += to_read - 1;
+
+        if (parser->content_length == 0)
+        {
+          UPDATE_STATE(s_message_done);
+
+          /* Mimic CALLBACK_DATA_NOADVANCE() but with one extra byte.
+           *
+           * The alternative to doing this is to wait for the next byte to
+           * trigger the data callback, just as in every other case. The
+           * problem with this is that this makes it difficult for the test
+           * harness to distinguish between complete-on-EOF and
+           * complete-on-length. It's not clear that this distinction is
+           * important for applications, but let's keep it for now.
+           */
+          CALLBACK_DATA_(body, p - body_mark + 1, p - data);
+          REEXECUTE();
+        }
+
+        break;
+      }
+
+      /* read until EOF */
+      case s_body_identity_eof:
+        MARK(body);
+        p = data + len - 1;
+
+        break;
+
+      case s_message_done:
+        UPDATE_STATE(NEW_MESSAGE());
+        CALLBACK_NOTIFY(message_complete);
+        if (parser->upgrade)
+        {
+          /* Exit, the rest of the message is in a different protocol. */
+          RETURN((p - data) + 1);
+        }
+        break;
+
+      case s_chunk_size_start:
+      {
+        assert(nread == 1);
+        assert(parser->flags & F_CHUNKED);
+
+        unhex_val = unhex[(unsigned char)ch];
+        if (UNLIKELY(unhex_val == -1))
+        {
+          SET_ERRNO(HPE_INVALID_CHUNK_SIZE);
+          goto error;
+        }
+
+        parser->content_length = unhex_val;
+        UPDATE_STATE(s_chunk_size);
+        break;
+      }
+
+      case s_chunk_size:
+      {
+        uint64_t t;
+
+        assert(parser->flags & F_CHUNKED);
+
+        if (ch == CR)
+        {
+          UPDATE_STATE(s_chunk_size_almost_done);
+          break;
+        }
+
+        unhex_val = unhex[(unsigned char)ch];
+
+        if (unhex_val == -1)
+        {
+          if (ch == ';' || ch == ' ')
+          {
+            UPDATE_STATE(s_chunk_parameters);
+            break;
+          }
+
+          SET_ERRNO(HPE_INVALID_CHUNK_SIZE);
+          goto error;
+        }
+
+        t = parser->content_length;
+        t *= 16;
+        t += unhex_val;
+
+        /* Overflow? Test against a conservative limit for simplicity. */
+        if (UNLIKELY((ULLONG_MAX - 16) / 16 < parser->content_length))
+        {
+          SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
+          goto error;
+        }
+
+        parser->content_length = t;
+        break;
+      }
+
+      case s_chunk_parameters:
+      {
+        assert(parser->flags & F_CHUNKED);
+        /* just ignore this shit. TODO check for overflow */
+        if (ch == CR)
+        {
+          UPDATE_STATE(s_chunk_size_almost_done);
+          break;
+        }
+        break;
+      }
+
+      case s_chunk_size_almost_done:
+      {
+        assert(parser->flags & F_CHUNKED);
+        STRICT_CHECK(ch != LF);
+
+        parser->nread = 0;
+        nread = 0;
+
+        if (parser->content_length == 0)
+        {
+          parser->flags |= F_TRAILING;
+          UPDATE_STATE(s_header_field_start);
+        }
+        else
+        {
+          UPDATE_STATE(s_chunk_data);
+        }
+        CALLBACK_NOTIFY(chunk_header);
+        break;
+      }
+
+      case s_chunk_data:
+      {
+        uint64_t to_read = MIN(parser->content_length,
+                               (uint64_t)((data + len) - p));
+
+        assert(parser->flags & F_CHUNKED);
+        assert(parser->content_length != 0 && parser->content_length != ULLONG_MAX);
+
+        /* See the explanation in s_body_identity for why the content
+         * length and data pointers are managed this way.
+         */
+        MARK(body);
+        parser->content_length -= to_read;
+        p += to_read - 1;
+
+        if (parser->content_length == 0)
+        {
+          UPDATE_STATE(s_chunk_data_almost_done);
+        }
+
+        break;
+      }
+
+      case s_chunk_data_almost_done:
+        assert(parser->flags & F_CHUNKED);
+        assert(parser->content_length == 0);
+        STRICT_CHECK(ch != CR);
+        UPDATE_STATE(s_chunk_data_done);
+        CALLBACK_DATA(body);
+        break;
+
+      case s_chunk_data_done:
+        assert(parser->flags & F_CHUNKED);
+        STRICT_CHECK(ch != LF);
+        parser->nread = 0;
+        nread = 0;
+        UPDATE_STATE(s_chunk_size_start);
+        CALLBACK_NOTIFY(chunk_complete);
+        break;
+
+      default:
+        assert(0 && "unhandled state");
+        SET_ERRNO(HPE_INVALID_INTERNAL_STATE);
+        goto error;
+      }
+    }
+
+    /* Run callbacks for any marks that we have leftover after we ran out of
+   * bytes. There should be at most one of these set, so it's OK to invoke
+   * them in series (unset marks will not result in callbacks).
+   *
+   * We use the NOADVANCE() variety of callbacks here because 'p' has already
+   * overflowed 'data' and this allows us to correct for the off-by-one that
+   * we'd otherwise have (since CALLBACK_DATA() is meant to be run with a 'p'
+   * value that's in-bounds).
+   */
+
+    assert(((header_field_mark ? 1 : 0) +
+            (header_value_mark ? 1 : 0) +
+            (url_mark ? 1 : 0) +
+            (body_mark ? 1 : 0) +
+            (status_mark ? 1 : 0)) <= 1);
+
+    CALLBACK_DATA_NOADVANCE(header_field);
+    CALLBACK_DATA_NOADVANCE(header_value);
+    CALLBACK_DATA_NOADVANCE(url);
+    CALLBACK_DATA_NOADVANCE(body);
+    CALLBACK_DATA_NOADVANCE(status);
+
+    RETURN(len);
+
+  error:
+    if (HTTP_PARSER_ERRNO(parser) == HPE_OK)
+    {
+      SET_ERRNO(HPE_UNKNOWN);
+    }
+
+    RETURN(p - data);
+  }
+
+  /* Does the parser need to see an EOF to find the end of the message? */
+  static int http_message_needs_eof(const http_parser *parser)
+  {
+    if (parser->type == HTTP_REQUEST)
+    {
+      return 0;
+    }
+
+    /* See RFC 2616 section 4.4 */
+    if (parser->status_code / 100 == 1 || /* 1xx e.g. Continue */
+        parser->status_code == 204 ||     /* No Content */
+        parser->status_code == 304 ||     /* Not Modified */
+        parser->flags & F_SKIPBODY)
+    { /* response to a HEAD request */
+      return 0;
+    }
+
+    if ((parser->flags & F_CHUNKED) || parser->content_length != ULLONG_MAX)
+    {
+      return 0;
+    }
+
+    return 1;
+  }
+
+  static int http_should_keep_alive(const http_parser *parser)
+  {
+    if (parser->http_major > 0 && parser->http_minor > 0)
+    {
+      /* HTTP/1.1 */
+      if (parser->flags & F_CONNECTION_CLOSE)
+      {
+        return 0;
+      }
+    }
+    else
+    {
+      /* HTTP/1.0 or earlier */
+      if (!(parser->flags & F_CONNECTION_KEEP_ALIVE))
+      {
+        return 0;
+      }
+    }
+
+    return !http_message_needs_eof(parser);
+  }
+
+  static const char *
+  http_method_str(enum http_method m)
+  {
+    return ELEM_AT(method_strings, m, "<unknown>");
+  }
+
+  static const char *
+  http_status_str(enum http_status s)
+  {
+    switch (s)
+    {
+#define XX(num, name, string) \
+  case HTTP_STATUS_##name:    \
+    return #string;
+      HTTP_STATUS_MAP(XX)
+#undef XX
+    default:
+      return "<unknown>";
+    }
+  }
+
+  static void
+  http_parser_init(http_parser *parser, enum http_parser_type t)
+  {
+    void *data = parser->data; /* preserve application data */
+    memset(parser, 0, sizeof(*parser));
+    parser->data = data;
+    parser->type = t;
+    parser->state = (t == HTTP_REQUEST ? s_start_req : (t == HTTP_RESPONSE ? s_start_res : s_start_req_or_res));
+    parser->http_errno = HPE_OK;
+  }
+
+  static void
+  http_parser_settings_init(http_parser_settings *settings)
+  {
+    memset(settings, 0, sizeof(*settings));
+  }
+
+  static const char *
+  http_errno_name(enum http_errno err)
+  {
+    assert(((size_t)err) < ARRAY_SIZE(http_strerror_tab));
+    return http_strerror_tab[err].name;
+  }
+
+  static const char *
+  http_errno_description(enum http_errno err)
+  {
+    assert(((size_t)err) < ARRAY_SIZE(http_strerror_tab));
+    return http_strerror_tab[err].description;
+  }
+
+  static enum http_host_state
+  http_parse_host_char(enum http_host_state s, const char ch)
+  {
+    switch (s)
+    {
+    case s_http_userinfo:
+    case s_http_userinfo_start:
+      if (ch == '@')
+      {
+        return s_http_host_start;
+      }
+
+      if (IS_USERINFO_CHAR(ch))
+      {
+        return s_http_userinfo;
+      }
+      break;
+
+    case s_http_host_start:
+      if (ch == '[')
+      {
+        return s_http_host_v6_start;
+      }
+
+      if (IS_HOST_CHAR(ch))
+      {
+        return s_http_host;
+      }
+
+      break;
+
+    case s_http_host:
+      if (IS_HOST_CHAR(ch))
+      {
+        return s_http_host;
+      }
+
+    /* fall through */
+    case s_http_host_v6_end:
+      if (ch == ':')
+      {
+        return s_http_host_port_start;
+      }
+
+      break;
+
+    case s_http_host_v6:
+      if (ch == ']')
+      {
+        return s_http_host_v6_end;
+      }
+
+    /* fall through */
+    case s_http_host_v6_start:
+      if (IS_HEX(ch) || ch == ':' || ch == '.')
+      {
+        return s_http_host_v6;
+      }
+
+      if (s == s_http_host_v6 && ch == '%')
+      {
+        return s_http_host_v6_zone_start;
+      }
+      break;
+
+    case s_http_host_v6_zone:
+      if (ch == ']')
+      {
+        return s_http_host_v6_end;
+      }
+
+    /* fall through */
+    case s_http_host_v6_zone_start:
+      /* RFC 6874 Zone ID consists of 1*( unreserved / pct-encoded) */
+      if (IS_ALPHANUM(ch) || ch == '%' || ch == '.' || ch == '-' || ch == '_' ||
+          ch == '~')
+      {
+        return s_http_host_v6_zone;
+      }
+      break;
+
+    case s_http_host_port:
+    case s_http_host_port_start:
+      if (IS_NUM(ch))
+      {
+        return s_http_host_port;
+      }
+
+      break;
+
+    default:
+      break;
+    }
+    return s_http_host_dead;
+  }
+
+  static int
+  http_parse_host(const char *buf, struct http_parser_url *u, int found_at)
+  {
+    enum http_host_state s;
+
+    const char *p;
+    size_t buflen = u->field_data[UF_HOST].off + u->field_data[UF_HOST].len;
+
+    assert(u->field_set & (1 << UF_HOST));
+
+    u->field_data[UF_HOST].len = 0;
+
+    s = found_at ? s_http_userinfo_start : s_http_host_start;
+
+    for (p = buf + u->field_data[UF_HOST].off; p < buf + buflen; p++)
+    {
+      enum http_host_state new_s = http_parse_host_char(s, *p);
+
+      if (new_s == s_http_host_dead)
+      {
+        return 1;
+      }
+
+      switch (new_s)
+      {
+      case s_http_host:
+        if (s != s_http_host)
+        {
+          u->field_data[UF_HOST].off = (uint16_t)(p - buf);
+        }
+        u->field_data[UF_HOST].len++;
+        break;
+
+      case s_http_host_v6:
+        if (s != s_http_host_v6)
+        {
+          u->field_data[UF_HOST].off = (uint16_t)(p - buf);
+        }
+        u->field_data[UF_HOST].len++;
+        break;
+
+      case s_http_host_v6_zone_start:
+      case s_http_host_v6_zone:
+        u->field_data[UF_HOST].len++;
+        break;
+
+      case s_http_host_port:
+        if (s != s_http_host_port)
+        {
+          u->field_data[UF_PORT].off = (uint16_t)(p - buf);
+          u->field_data[UF_PORT].len = 0;
+          u->field_set |= (1 << UF_PORT);
+        }
+        u->field_data[UF_PORT].len++;
+        break;
+
+      case s_http_userinfo:
+        if (s != s_http_userinfo)
+        {
+          u->field_data[UF_USERINFO].off = (uint16_t)(p - buf);
+          u->field_data[UF_USERINFO].len = 0;
+          u->field_set |= (1 << UF_USERINFO);
+        }
+        u->field_data[UF_USERINFO].len++;
+        break;
+
+      default:
+        break;
+      }
+      s = new_s;
+    }
+
+    /* Make sure we don't end somewhere unexpected */
+    switch (s)
+    {
+    case s_http_host_start:
+    case s_http_host_v6_start:
+    case s_http_host_v6:
+    case s_http_host_v6_zone_start:
+    case s_http_host_v6_zone:
+    case s_http_host_port_start:
+    case s_http_userinfo:
+    case s_http_userinfo_start:
+      return 1;
+    default:
+      break;
+    }
+
+    return 0;
+  }
+
+  static void
+  http_parser_url_init(struct http_parser_url *u)
+  {
+    memset(u, 0, sizeof(*u));
+  }
+
+  static int http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
+                            struct http_parser_url *u)
+  {
+    enum state s;
+    const char *p;
+    enum http_parser_url_fields uf, old_uf;
+    int found_at = 0;
+
+    if (buflen == 0)
+    {
+      return 1;
+    }
+
+    u->port = u->field_set = 0;
+    s = is_connect ? s_req_server_start : s_req_spaces_before_url;
+    old_uf = UF_MAX;
+
+    for (p = buf; p < buf + buflen; p++)
+    {
+      s = parse_url_char(s, *p);
+
+      /* Figure out the next field that we're operating on */
+      switch (s)
+      {
+      case s_dead:
+        return 1;
+
+      /* Skip delimeters */
+      case s_req_schema_slash:
+      case s_req_schema_slash_slash:
+      case s_req_server_start:
+      case s_req_query_string_start:
+      case s_req_fragment_start:
+        continue;
+
+      case s_req_schema:
+        uf = UF_SCHEMA;
+        break;
+
+      case s_req_server_with_at:
+        found_at = 1;
+
+      /* fall through */
+      case s_req_server:
+        uf = UF_HOST;
+        break;
+
+      case s_req_path:
+        uf = UF_PATH;
+        break;
+
+      case s_req_query_string:
+        uf = UF_QUERY;
+        break;
+
+      case s_req_fragment:
+        uf = UF_FRAGMENT;
+        break;
+
+      default:
+        assert(!"Unexpected state");
+        return 1;
+      }
+
+      /* Nothing's changed; soldier on */
+      if (uf == old_uf)
+      {
+        u->field_data[uf].len++;
+        continue;
+      }
+
+      u->field_data[uf].off = (uint16_t)(p - buf);
+      u->field_data[uf].len = 1;
+
+      u->field_set |= (1 << uf);
+      old_uf = uf;
+    }
+
+    /* host must be present if there is a schema */
+    /* parsing http:///toto will fail */
+    if ((u->field_set & (1 << UF_SCHEMA)) &&
+        (u->field_set & (1 << UF_HOST)) == 0)
+    {
+      return 1;
+    }
+
+    if (u->field_set & (1 << UF_HOST))
+    {
+      if (http_parse_host(buf, u, found_at) != 0)
+      {
+        return 1;
+      }
+    }
+
+    /* CONNECT requests can only contain "hostname:port" */
+    if (is_connect && u->field_set != ((1 << UF_HOST) | (1 << UF_PORT)))
+    {
+      return 1;
+    }
+
+    if (u->field_set & (1 << UF_PORT))
+    {
+      uint16_t off;
+      uint16_t len;
+      const char *p;
+      const char *end;
+      unsigned long v;
+
+      off = u->field_data[UF_PORT].off;
+      len = u->field_data[UF_PORT].len;
+      end = buf + off + len;
+
+      /* NOTE: The characters are already validated and are in the [0-9] range */
+      assert(off + len <= buflen && "Port number overflow");
+      v = 0;
+      for (p = buf + off; p < end; p++)
+      {
+        v *= 10;
+        v += *p - '0';
+
+        /* Ports have a max value of 2^16 */
+        if (v > 0xffff)
+        {
+          return 1;
+        }
+      }
+
+      u->port = (uint16_t)v;
+    }
+
+    return 0;
+  }
+
+  static void
+  http_parser_pause(http_parser *parser, int paused)
+  {
+    /* Users should only be pausing/unpausing a parser that is not in an error
+   * state. In non-debug builds, there's not much that we can do about this
+   * other than ignore it.
+   */
+    if (HTTP_PARSER_ERRNO(parser) == HPE_OK ||
+        HTTP_PARSER_ERRNO(parser) == HPE_PAUSED)
+    {
+      uint32_t nread = parser->nread; /* used by the SET_ERRNO macro */
+      SET_ERRNO((paused) ? HPE_PAUSED : HPE_OK);
+    }
+    else
+    {
+      assert(0 && "Attempting to pause parser in error state");
+    }
+  }
+
+  static int http_body_is_final(const struct http_parser *parser)
+  {
+    return parser->state == s_message_done;
+  }
+
+  static  unsigned long
+  http_parser_version(void)
+  {
+    return HTTP_PARSER_VERSION_MAJOR * 0x10000 |
+           HTTP_PARSER_VERSION_MINOR * 0x00100 |
+           HTTP_PARSER_VERSION_PATCH * 0x00001;
+  }
+
+  static void
+  http_parser_set_max_header_size(uint32_t size)
+  {
+    max_header_size = size;
+  }
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/port/Win.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/port/Win.hpp
new file mode 100644
index 00000000..07e0bd78
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/port/Win.hpp
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <brynet/net/SocketLibTypes.hpp>
+
+namespace brynet { namespace net { namespace port {
+
+#ifdef BRYNET_PLATFORM_WINDOWS
+    class Win
+    {
+    public:
+        enum class OverlappedType
+        {
+            OverlappedNone = 0,
+            OverlappedRecv,
+            OverlappedSend,
+        };
+
+        struct OverlappedExt
+        {
+            OVERLAPPED  base;
+            const OverlappedType  OP;
+
+            OverlappedExt(OverlappedType op) BRYNET_NOEXCEPT : OP(op)
+            {
+                memset(&base, 0, sizeof(base));
+            }
+        };
+    };
+#endif
+
+} } }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/wrapper/ConnectionBuilder.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/wrapper/ConnectionBuilder.hpp
new file mode 100644
index 00000000..7cdc8ee3
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/wrapper/ConnectionBuilder.hpp
@@ -0,0 +1,191 @@
+#pragma once
+
+#include <future>
+#include <brynet/net/TcpService.hpp>
+#include <brynet/net/AsyncConnector.hpp>
+#include <brynet/net/Exception.hpp>
+
+namespace brynet { namespace net { namespace wrapper {
+
+    template<typename Derived>
+    class BaseSocketConnectBuilder
+    {
+    protected:
+        using AddSocketOptionFunc = detail::AddSocketOptionFunc;
+        using ConnectOptionFunc = detail::ConnectOptionFunc;
+
+    public:
+        virtual ~BaseSocketConnectBuilder() = default;
+
+        Derived& configureConnector(AsyncConnector::Ptr connector)
+        {
+            mConnector = std::move(connector);
+            return static_cast<Derived&>(*this);
+        }
+
+        Derived& configureConnectOptions(
+            std::vector<ConnectOptionFunc> options)
+        {
+            mConnectOptions = std::move(options);
+            return static_cast<Derived&>(*this);
+        }
+
+        void    asyncConnect() const
+        {
+            asyncConnect(mConnectOptions);
+        }
+
+        TcpSocket::Ptr    syncConnect() const
+        {
+            return syncConnect(mConnectOptions);
+        }
+
+    protected:
+        void    asyncConnect(std::vector<ConnectOptionFunc> connectOptions) const
+        {
+            if (mConnector == nullptr)
+            {
+                throw BrynetCommonException("connector is nullptr");
+            }
+            if (connectOptions.empty())
+            {
+                throw BrynetCommonException("options is empty");
+            }
+
+            mConnector->asyncConnect(connectOptions);
+        }
+
+        TcpSocket::Ptr  syncConnect(std::vector<ConnectOptionFunc> connectOptions) const
+        {
+            auto timeout = ConnectOption::ExtractTimeout(connectOptions);
+
+            auto socketPromise = std::make_shared<std::promise<TcpSocket::Ptr>>();
+            connectOptions.push_back(ConnectOption::WithCompletedCallback(
+                [socketPromise](TcpSocket::Ptr socket) {
+                    socketPromise->set_value(std::move(socket));
+                }));
+            connectOptions.push_back(ConnectOption::WithFailedCallback([socketPromise]() {
+                    socketPromise->set_value(nullptr);
+                }));
+
+            asyncConnect(connectOptions);
+
+            auto future = socketPromise->get_future();
+            if (future.wait_for(timeout) != std::future_status::ready)
+            {
+                return nullptr;
+            }
+
+            return future.get();
+        }
+
+        std::vector<ConnectOptionFunc>  getConnectOptions() const
+        {
+            return mConnectOptions;
+        }
+
+    private:
+        AsyncConnector::Ptr             mConnector;
+        std::vector<ConnectOptionFunc>  mConnectOptions;
+    };
+
+    class SocketConnectBuilder : public BaseSocketConnectBuilder<SocketConnectBuilder>
+    {
+    };
+
+    template<typename Derived>
+    class BaseConnectionBuilder : public BaseSocketConnectBuilder<Derived>
+    {
+    protected:
+        using AddSocketOptionFunc = detail::AddSocketOptionFunc;
+        using ConnectOptionFunc = detail::ConnectOptionFunc;
+
+    public:
+        Derived& configureService(TcpService::Ptr service)
+        {
+            mTcpService = std::move(service);
+            return static_cast<Derived&>(*this);
+        }
+
+        Derived& configureConnectionOptions(std::vector<AddSocketOptionFunc> options)
+        {
+            mConnectionOptions = std::move(options);
+            return static_cast<Derived&>(*this);
+        }
+
+        void    asyncConnect() const
+        {
+            asyncConnect(BaseSocketConnectBuilder<Derived>::getConnectOptions(), 
+                mConnectionOptions);
+        }
+
+        TcpConnection::Ptr    syncConnect() const
+        {
+            return syncConnect(BaseSocketConnectBuilder<Derived>::getConnectOptions(), 
+                mConnectionOptions);
+        }
+
+    protected:
+        void    asyncConnect(std::vector<ConnectOptionFunc> connectOptions,
+            std::vector<AddSocketOptionFunc> connectionOptions) const
+        {
+            if (mTcpService == nullptr)
+            {
+                throw BrynetCommonException("tcp serviceis nullptr");
+            }
+            if (connectionOptions.empty())
+            {
+                throw BrynetCommonException("options is empty");
+            }
+
+            auto service = mTcpService;
+            auto enterCallback = [service, connectionOptions](TcpSocket::Ptr socket) mutable {
+                service->addTcpConnection(std::move(socket), connectionOptions);
+            };
+            connectOptions.push_back(ConnectOption::WithCompletedCallback(enterCallback));
+
+            BaseSocketConnectBuilder<Derived>::asyncConnect(connectOptions);
+        }
+
+        TcpConnection::Ptr  syncConnect(std::vector<ConnectOptionFunc> connectOptions,
+            std::vector<AddSocketOptionFunc> connectionOptions) const
+        {
+            auto timeout = ConnectOption::ExtractTimeout(connectOptions);
+            auto sessionPromise = std::make_shared<std::promise<TcpConnection::Ptr>>();
+
+            connectOptions.push_back(ConnectOption::WithFailedCallback(
+                [sessionPromise]() {
+                    sessionPromise->set_value(nullptr);
+                }));
+
+            connectionOptions.push_back(AddSocketOption::AddEnterCallback(
+                [sessionPromise](const TcpConnection::Ptr& session) {
+                    sessionPromise->set_value(session);
+                }));
+
+            asyncConnect(connectOptions, connectionOptions);
+
+            auto future = sessionPromise->get_future();
+            if (future.wait_for(timeout) != std::future_status::ready)
+            {
+                return nullptr;
+            }
+
+            return future.get();
+        }
+
+        std::vector<AddSocketOptionFunc>   getConnectionOptions() const
+        {
+            return mConnectionOptions;
+        }
+
+    private:
+        TcpService::Ptr                     mTcpService;
+        std::vector<AddSocketOptionFunc>    mConnectionOptions;
+    };
+
+    class ConnectionBuilder : public BaseConnectionBuilder<ConnectionBuilder>
+    {
+    };
+
+} } }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/wrapper/HttpConnectionBuilder.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/wrapper/HttpConnectionBuilder.hpp
new file mode 100644
index 00000000..7f4467d9
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/wrapper/HttpConnectionBuilder.hpp
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <brynet/net/http/HttpService.hpp>
+#include <brynet/net/wrapper/ConnectionBuilder.hpp>
+
+namespace brynet { namespace net { namespace wrapper {
+
+    class HttpConnectionBuilder : public BaseConnectionBuilder<HttpConnectionBuilder>
+    {
+    public:
+        HttpConnectionBuilder& configureEnterCallback(
+            http::HttpSession::EnterCallback&& callback)
+        {
+            mHttpEnterCallback = std::move(callback);
+            return *this;
+        }
+
+        void    asyncConnect() const
+        {
+            if (mHttpEnterCallback == nullptr)
+            {
+                throw BrynetCommonException("not setting http enter callback");
+            }
+
+            auto connectionOptions = 
+                BaseConnectionBuilder<HttpConnectionBuilder>::getConnectionOptions();
+            auto callback = mHttpEnterCallback;
+
+            connectionOptions.push_back(
+                AddSocketOption::AddEnterCallback(
+                    [callback](const TcpConnection::Ptr& session) {
+                    http::HttpService::setup(session, callback);
+                    }));
+
+            BaseConnectionBuilder<HttpConnectionBuilder>::asyncConnect(
+                BaseConnectionBuilder<HttpConnectionBuilder>::getConnectOptions(), 
+                connectionOptions);
+        }
+
+    private:
+        http::HttpSession::EnterCallback    mHttpEnterCallback;
+    };
+
+} } }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/wrapper/HttpServiceBuilder.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/wrapper/HttpServiceBuilder.hpp
new file mode 100644
index 00000000..692d4124
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/wrapper/HttpServiceBuilder.hpp
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <brynet/net/http/HttpService.hpp>
+#include <brynet/net/wrapper/ServiceBuilder.hpp>
+
+namespace brynet { namespace net { namespace wrapper {
+
+    class HttpListenerBuilder : public BaseListenerBuilder<HttpListenerBuilder>
+    {
+    public:
+        HttpListenerBuilder& configureEnterCallback(http::HttpSession::EnterCallback&& callback)
+        {
+            mHttpEnterCallback = std::move(callback);
+            return *this;
+        }
+
+        void asyncRun()
+        {
+            if (mHttpEnterCallback == nullptr)
+            {
+                throw BrynetCommonException("not setting http enter callback");
+            }
+
+            auto connectionOptions = 
+                BaseListenerBuilder<HttpListenerBuilder>::getConnectionOptions();
+            auto callback = mHttpEnterCallback;
+            connectionOptions.push_back(
+                AddSocketOption::AddEnterCallback(
+                    [callback](const TcpConnection::Ptr& session) {
+                    http::HttpService::setup(session, callback);
+                }));
+            BaseListenerBuilder<HttpListenerBuilder>::asyncRun(connectionOptions);
+        }
+
+    private:
+        http::HttpSession::EnterCallback    mHttpEnterCallback;
+    };
+
+} } }
\ No newline at end of file
diff --git a/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/wrapper/ServiceBuilder.hpp b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/wrapper/ServiceBuilder.hpp
new file mode 100644
index 00000000..ce340eec
--- /dev/null
+++ b/Drivers/ScanLabOIE/LibOIE/Libraries/brynet/net/wrapper/ServiceBuilder.hpp
@@ -0,0 +1,167 @@
+#pragma once
+
+#include <brynet/net/TcpService.hpp>
+#include <brynet/net/ListenThread.hpp>
+#include <brynet/net/Exception.hpp>
+
+namespace brynet { namespace net { namespace wrapper {
+
+    class ListenConfig final
+    {
+    public:
+        ListenConfig()
+        {
+            mSetting = false;
+            mIsIpV6 = false;
+            mPort = 0;
+        }
+
+        void        setAddr(bool ipV6, std::string ip, int port)
+        {
+            mIsIpV6 = ipV6;
+            mListenAddr = ip;
+            mPort = port;
+            mSetting = true;
+        }
+
+        std::string ip() const
+        {
+            return mListenAddr;
+        }
+
+        int         port() const
+        {
+            return mPort;
+        }
+
+        bool        useIpV6() const
+        {
+            return mIsIpV6;
+        }
+
+        bool        hasSetting() const
+        {
+            return mSetting;
+        }
+
+    private:
+        std::string mListenAddr;
+        int         mPort;
+        bool        mIsIpV6;
+        bool        mSetting;
+    };
+
+    class BuildListenConfig
+    {
+    public:
+        explicit BuildListenConfig(ListenConfig* config)
+            :
+            mConfig(config)
+        {
+        }
+
+        void        setAddr(bool ipV6, std::string ip, int port)
+        {
+            mConfig->setAddr(ipV6, ip, port);
+        }
+
+    private:
+        ListenConfig* mConfig;
+    };
+
+    template<typename Derived>
+    class BaseListenerBuilder
+    {
+    protected:
+        using AddSocketOptionFunc = detail::AddSocketOptionFunc;
+        using ConnectOptionFunc = detail::ConnectOptionFunc;
+
+    public:
+        virtual ~BaseListenerBuilder() = default;
+
+        Derived& configureService(TcpService::Ptr service)
+        {
+            mTcpService = std::move(service);
+            return static_cast<Derived&>(*this);
+        }
+
+        Derived& configureSocketOptions(std::vector<ListenThread::TcpSocketProcessCallback> options)
+        {
+            mSocketOptions = std::move(options);
+            return static_cast<Derived&>(*this);
+        }
+
+        Derived& configureConnectionOptions(std::vector<AddSocketOptionFunc> options)
+        {
+            mConnectionOptions = std::move(options);
+            return static_cast<Derived&>(*this);
+        }
+
+        template<typename BuilderFunc>
+        Derived& configureListen(const BuilderFunc& builder)
+        {
+            BuildListenConfig buildConfig(&mListenConfig);
+            builder(buildConfig);
+            return static_cast<Derived&>(*this);
+        }
+
+        void asyncRun()
+        {
+            asyncRun(getConnectionOptions());
+        }
+
+        void    stop()
+        {
+            if (mListenThread)
+            {
+                mListenThread->stopListen();
+            }
+        }
+
+        std::vector<AddSocketOptionFunc>   getConnectionOptions() const
+        {
+            return mConnectionOptions;
+        }
+
+    protected:
+        void asyncRun(std::vector<AddSocketOptionFunc> connectionOptions)
+        {
+            if (mTcpService == nullptr)
+            {
+                throw BrynetCommonException("tcp service is nullptr");
+            }
+            if (connectionOptions.empty())
+            {
+                throw BrynetCommonException("options is empty");
+            }
+            if (!mListenConfig.hasSetting())
+            {
+                throw BrynetCommonException("not config listen addr");
+            }
+
+            auto service = mTcpService;
+            mListenThread = ListenThread::Create(mListenConfig.useIpV6(),
+                mListenConfig.ip(),
+                mListenConfig.port(),
+                [service, connectionOptions](brynet::net::TcpSocket::Ptr socket) {
+                    service->addTcpConnection(std::move(socket), connectionOptions);
+                },
+                mSocketOptions);
+            mListenThread->startListen();
+        }
+
+    private:
+        TcpService::Ptr                                     mTcpService;
+        std::vector<ListenThread::TcpSocketProcessCallback> mSocketOptions;
+        ListenConfig                                        mListenConfig;
+        ListenThread::Ptr                                   mListenThread;
+
+    private:
+        std::vector<AddSocketOptionFunc>                    mConnectionOptions;
+    };
+
+    class ListenerBuilder : public BaseListenerBuilder<ListenerBuilder>
+    {
+    };
+
+} } }
\ No newline at end of file
diff --git a/Framework/HeadersCore/CppDynamic/libmc_abi.hpp b/Framework/HeadersCore/CppDynamic/libmc_abi.hpp
index d35a74a8..1585bb83 100644
--- a/Framework/HeadersCore/CppDynamic/libmc_abi.hpp
+++ b/Framework/HeadersCore/CppDynamic/libmc_abi.hpp
@@ -62,39 +62,87 @@ extern "C" {
 **************************************************************************************************************************/
 
 /*************************************************************************************************************************
- Class definition for APIResponse
+ Class definition for APIRequestHandler
 **************************************************************************************************************************/
 
 /**
-* returns the HTTP Errorcode to set (200 for success).
+* checks if the raw body is needed to handle the request.
 *
-* @param[in] pAPIResponse - APIResponse instance.
-* @param[out] pHTTPCode - HTTP Code
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[out] pValue - Flag, if the raw body is needed in the request.
 * @return error code or 0 (success)
 */
-LIBMC_DECLSPEC LibMCResult libmc_apiresponse_gethttpcode(LibMC_APIResponse pAPIResponse, LibMC_uint32 * pHTTPCode);
+LIBMC_DECLSPEC LibMCResult libmc_apirequesthandler_expectsrawbody(LibMC_APIRequestHandler pAPIRequestHandler, bool * pValue);
 
 /**
-* returns the content type string of the data.
+* checks if the parsed form data is needed to handle the request.
 *
-* @param[in] pAPIResponse - APIResponse instance.
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[out] pFieldCount - Number of Form Data entries that are expected.
+* @param[out] pValue - Flag, if the parsed form data is needed in the request.
+* @return error code or 0 (success)
+*/
+LIBMC_DECLSPEC LibMCResult libmc_apirequesthandler_expectsformdata(LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint32 * pFieldCount, bool * pValue);
+
+/**
+* returns details of expected form data.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] nFieldIndex - Index of Form Data Field (0..FieldCount - 1)
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name of the expected form data field., may be NULL
+* @param[out] pIsFile - Flag, if the field Is a file field.
+* @param[out] pMandatory - Flag, if the field MUST be present.
+* @return error code or 0 (success)
+*/
+LIBMC_DECLSPEC LibMCResult libmc_apirequesthandler_getformdatadetails(LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint32 nFieldIndex, const LibMC_uint32 nNameBufferSize, LibMC_uint32* pNameNeededChars, char * pNameBuffer, bool * pIsFile, bool * pMandatory);
+
+/**
+* passes the a form data field to the request handler. Call only, if ExpectsFormData returns true.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] pName - Name of the form data field.
+* @param[in] nDataFieldBufferSize - Number of elements in buffer
+* @param[in] pDataFieldBuffer - uint8 buffer of DataField that was sent.
+* @return error code or 0 (success)
+*/
+LIBMC_DECLSPEC LibMCResult libmc_apirequesthandler_setformdatafield(LibMC_APIRequestHandler pAPIRequestHandler, const char * pName, LibMC_uint64 nDataFieldBufferSize, const LibMC_uint8 * pDataFieldBuffer);
+
+/**
+* passes the a form string field to the request handler. Call only, if ExpectsFormData returns true.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] pName - Name of the form data field.
+* @param[in] pString - DataString that was sent.
+* @return error code or 0 (success)
+*/
+LIBMC_DECLSPEC LibMCResult libmc_apirequesthandler_setformstringfield(LibMC_APIRequestHandler pAPIRequestHandler, const char * pName, const char * pString);
+
+/**
+* handles the request.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] nRawBodyBufferSize - Number of elements in buffer
+* @param[in] pRawBodyBuffer - uint8 buffer of Raw Body that was sent. Only necessary, if ExpectsRawBody returns true.
 * @param[in] nContentTypeBufferSize - size of the buffer (including trailing 0)
 * @param[out] pContentTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
-* @param[out] pContentTypeBuffer -  buffer of Content Type., may be NULL
+* @param[out] pContentTypeBuffer -  buffer of the resulting Content Type String of the data., may be NULL
+* @param[out] pHTTPCode - the resulting HTTP Errorcode (200 for success).
 * @return error code or 0 (success)
 */
-LIBMC_DECLSPEC LibMCResult libmc_apiresponse_getcontenttype(LibMC_APIResponse pAPIResponse, const LibMC_uint32 nContentTypeBufferSize, LibMC_uint32* pContentTypeNeededChars, char * pContentTypeBuffer);
+LIBMC_DECLSPEC LibMCResult libmc_apirequesthandler_handle(LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint64 nRawBodyBufferSize, const LibMC_uint8 * pRawBodyBuffer, const LibMC_uint32 nContentTypeBufferSize, LibMC_uint32* pContentTypeNeededChars, char * pContentTypeBuffer, LibMC_uint32 * pHTTPCode);
 
 /**
-* returns the stream content of the data.
+* returns the cached stream content of the resulting data. Call only after Handle().
 *
-* @param[in] pAPIResponse - APIResponse instance.
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
 * @param[in] nDataBufferSize - Number of elements in buffer
 * @param[out] pDataNeededCount - will be filled with the count of the written elements, or needed buffer size.
 * @param[out] pDataBuffer - uint8 buffer of Binary stream data
 * @return error code or 0 (success)
 */
-LIBMC_DECLSPEC LibMCResult libmc_apiresponse_getdata(LibMC_APIResponse pAPIResponse, const LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer);
+LIBMC_DECLSPEC LibMCResult libmc_apirequesthandler_getresultdata(LibMC_APIRequestHandler pAPIRequestHandler, const LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer);
 
 /*************************************************************************************************************************
  Class definition for MCContext
@@ -157,26 +205,15 @@ LIBMC_DECLSPEC LibMCResult libmc_mccontext_loadclientpackage(LibMC_MCContext pMC
 LIBMC_DECLSPEC LibMCResult libmc_mccontext_log(LibMC_MCContext pMCContext, const char * pMessage, LibMC::eLogSubSystem eSubsystem, LibMC::eLogLevel eLogLevel);
 
 /**
-* handle an API GET request.
-*
-* @param[in] pMCContext - MCContext instance.
-* @param[in] pURI - URI to serve
-* @param[out] pResponse - Response instance.
-* @return error code or 0 (success)
-*/
-LIBMC_DECLSPEC LibMCResult libmc_mccontext_handleapigetrequest(LibMC_MCContext pMCContext, const char * pURI, LibMC_APIResponse * pResponse);
-
-/**
-* handle an API POST request.
+* creates an API request handler.
 *
 * @param[in] pMCContext - MCContext instance.
 * @param[in] pURI - URI to serve
-* @param[in] nBodyBufferSize - Number of elements in buffer
-* @param[in] pBodyBuffer - uint8 buffer of Body that was sent.
-* @param[out] pResponse - Response instance.
+* @param[in] pRequestMethod - Request Method
+* @param[out] pHandlerInstance - Request Handler instance.
 * @return error code or 0 (success)
 */
-LIBMC_DECLSPEC LibMCResult libmc_mccontext_handleapipostrequest(LibMC_MCContext pMCContext, const char * pURI, LibMC_uint64 nBodyBufferSize, const LibMC_uint8 * pBodyBuffer, LibMC_APIResponse * pResponse);
+LIBMC_DECLSPEC LibMCResult libmc_mccontext_createapirequesthandler(LibMC_MCContext pMCContext, const char * pURI, const char * pRequestMethod, LibMC_APIRequestHandler * pHandlerInstance);
 
 /*************************************************************************************************************************
  Global functions
diff --git a/Framework/HeadersCore/CppDynamic/libmc_dynamic.h b/Framework/HeadersCore/CppDynamic/libmc_dynamic.h
index ce1b94dd..9142f354 100644
--- a/Framework/HeadersCore/CppDynamic/libmc_dynamic.h
+++ b/Framework/HeadersCore/CppDynamic/libmc_dynamic.h
@@ -49,39 +49,87 @@ Interface version: 1.0.0
 **************************************************************************************************************************/
 
 /*************************************************************************************************************************
- Class definition for APIResponse
+ Class definition for APIRequestHandler
 **************************************************************************************************************************/
 
 /**
-* returns the HTTP Errorcode to set (200 for success).
+* checks if the raw body is needed to handle the request.
 *
-* @param[in] pAPIResponse - APIResponse instance.
-* @param[out] pHTTPCode - HTTP Code
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[out] pValue - Flag, if the raw body is needed in the request.
 * @return error code or 0 (success)
 */
-typedef LibMCResult (*PLibMCAPIResponse_GetHTTPCodePtr) (LibMC_APIResponse pAPIResponse, LibMC_uint32 * pHTTPCode);
+typedef LibMCResult (*PLibMCAPIRequestHandler_ExpectsRawBodyPtr) (LibMC_APIRequestHandler pAPIRequestHandler, bool * pValue);
 
 /**
-* returns the content type string of the data.
+* checks if the parsed form data is needed to handle the request.
 *
-* @param[in] pAPIResponse - APIResponse instance.
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[out] pFieldCount - Number of Form Data entries that are expected.
+* @param[out] pValue - Flag, if the parsed form data is needed in the request.
+* @return error code or 0 (success)
+*/
+typedef LibMCResult (*PLibMCAPIRequestHandler_ExpectsFormDataPtr) (LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint32 * pFieldCount, bool * pValue);
+
+/**
+* returns details of expected form data.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] nFieldIndex - Index of Form Data Field (0..FieldCount - 1)
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name of the expected form data field., may be NULL
+* @param[out] pIsFile - Flag, if the field Is a file field.
+* @param[out] pMandatory - Flag, if the field MUST be present.
+* @return error code or 0 (success)
+*/
+typedef LibMCResult (*PLibMCAPIRequestHandler_GetFormDataDetailsPtr) (LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint32 nFieldIndex, const LibMC_uint32 nNameBufferSize, LibMC_uint32* pNameNeededChars, char * pNameBuffer, bool * pIsFile, bool * pMandatory);
+
+/**
+* passes the a form data field to the request handler. Call only, if ExpectsFormData returns true.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] pName - Name of the form data field.
+* @param[in] nDataFieldBufferSize - Number of elements in buffer
+* @param[in] pDataFieldBuffer - uint8 buffer of DataField that was sent.
+* @return error code or 0 (success)
+*/
+typedef LibMCResult (*PLibMCAPIRequestHandler_SetFormDataFieldPtr) (LibMC_APIRequestHandler pAPIRequestHandler, const char * pName, LibMC_uint64 nDataFieldBufferSize, const LibMC_uint8 * pDataFieldBuffer);
+
+/**
+* passes the a form string field to the request handler. Call only, if ExpectsFormData returns true.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] pName - Name of the form data field.
+* @param[in] pString - DataString that was sent.
+* @return error code or 0 (success)
+*/
+typedef LibMCResult (*PLibMCAPIRequestHandler_SetFormStringFieldPtr) (LibMC_APIRequestHandler pAPIRequestHandler, const char * pName, const char * pString);
+
+/**
+* handles the request.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] nRawBodyBufferSize - Number of elements in buffer
+* @param[in] pRawBodyBuffer - uint8 buffer of Raw Body that was sent. Only necessary, if ExpectsRawBody returns true.
 * @param[in] nContentTypeBufferSize - size of the buffer (including trailing 0)
 * @param[out] pContentTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
-* @param[out] pContentTypeBuffer -  buffer of Content Type., may be NULL
+* @param[out] pContentTypeBuffer -  buffer of the resulting Content Type String of the data., may be NULL
+* @param[out] pHTTPCode - the resulting HTTP Errorcode (200 for success).
 * @return error code or 0 (success)
 */
-typedef LibMCResult (*PLibMCAPIResponse_GetContentTypePtr) (LibMC_APIResponse pAPIResponse, const LibMC_uint32 nContentTypeBufferSize, LibMC_uint32* pContentTypeNeededChars, char * pContentTypeBuffer);
+typedef LibMCResult (*PLibMCAPIRequestHandler_HandlePtr) (LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint64 nRawBodyBufferSize, const LibMC_uint8 * pRawBodyBuffer, const LibMC_uint32 nContentTypeBufferSize, LibMC_uint32* pContentTypeNeededChars, char * pContentTypeBuffer, LibMC_uint32 * pHTTPCode);
 
 /**
-* returns the stream content of the data.
+* returns the cached stream content of the resulting data. Call only after Handle().
 *
-* @param[in] pAPIResponse - APIResponse instance.
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
 * @param[in] nDataBufferSize - Number of elements in buffer
 * @param[out] pDataNeededCount - will be filled with the count of the written elements, or needed buffer size.
 * @param[out] pDataBuffer - uint8 buffer of Binary stream data
 * @return error code or 0 (success)
 */
-typedef LibMCResult (*PLibMCAPIResponse_GetDataPtr) (LibMC_APIResponse pAPIResponse, const LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer);
+typedef LibMCResult (*PLibMCAPIRequestHandler_GetResultDataPtr) (LibMC_APIRequestHandler pAPIRequestHandler, const LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer);
 
 /*************************************************************************************************************************
  Class definition for MCContext
@@ -144,26 +192,15 @@ typedef LibMCResult (*PLibMCMCContext_LoadClientPackagePtr) (LibMC_MCContext pMC
 typedef LibMCResult (*PLibMCMCContext_LogPtr) (LibMC_MCContext pMCContext, const char * pMessage, LibMC::eLogSubSystem eSubsystem, LibMC::eLogLevel eLogLevel);
 
 /**
-* handle an API GET request.
-*
-* @param[in] pMCContext - MCContext instance.
-* @param[in] pURI - URI to serve
-* @param[out] pResponse - Response instance.
-* @return error code or 0 (success)
-*/
-typedef LibMCResult (*PLibMCMCContext_HandleAPIGetRequestPtr) (LibMC_MCContext pMCContext, const char * pURI, LibMC_APIResponse * pResponse);
-
-/**
-* handle an API POST request.
+* creates an API request handler.
 *
 * @param[in] pMCContext - MCContext instance.
 * @param[in] pURI - URI to serve
-* @param[in] nBodyBufferSize - Number of elements in buffer
-* @param[in] pBodyBuffer - uint8 buffer of Body that was sent.
-* @param[out] pResponse - Response instance.
+* @param[in] pRequestMethod - Request Method
+* @param[out] pHandlerInstance - Request Handler instance.
 * @return error code or 0 (success)
 */
-typedef LibMCResult (*PLibMCMCContext_HandleAPIPostRequestPtr) (LibMC_MCContext pMCContext, const char * pURI, LibMC_uint64 nBodyBufferSize, const LibMC_uint8 * pBodyBuffer, LibMC_APIResponse * pResponse);
+typedef LibMCResult (*PLibMCMCContext_CreateAPIRequestHandlerPtr) (LibMC_MCContext pMCContext, const char * pURI, const char * pRequestMethod, LibMC_APIRequestHandler * pHandlerInstance);
 
 /*************************************************************************************************************************
  Global functions
@@ -231,17 +268,20 @@ typedef LibMCResult (*PLibMCCreateMCContextPtr) (LibMCData_DataModel pDataModel,
 
 typedef struct {
 	void * m_LibraryHandle;
-	PLibMCAPIResponse_GetHTTPCodePtr m_APIResponse_GetHTTPCode;
-	PLibMCAPIResponse_GetContentTypePtr m_APIResponse_GetContentType;
-	PLibMCAPIResponse_GetDataPtr m_APIResponse_GetData;
+	PLibMCAPIRequestHandler_ExpectsRawBodyPtr m_APIRequestHandler_ExpectsRawBody;
+	PLibMCAPIRequestHandler_ExpectsFormDataPtr m_APIRequestHandler_ExpectsFormData;
+	PLibMCAPIRequestHandler_GetFormDataDetailsPtr m_APIRequestHandler_GetFormDataDetails;
+	PLibMCAPIRequestHandler_SetFormDataFieldPtr m_APIRequestHandler_SetFormDataField;
+	PLibMCAPIRequestHandler_SetFormStringFieldPtr m_APIRequestHandler_SetFormStringField;
+	PLibMCAPIRequestHandler_HandlePtr m_APIRequestHandler_Handle;
+	PLibMCAPIRequestHandler_GetResultDataPtr m_APIRequestHandler_GetResultData;
 	PLibMCMCContext_RegisterLibraryPathPtr m_MCContext_RegisterLibraryPath;
 	PLibMCMCContext_ParseConfigurationPtr m_MCContext_ParseConfiguration;
 	PLibMCMCContext_StartAllThreadsPtr m_MCContext_StartAllThreads;
 	PLibMCMCContext_TerminateAllThreadsPtr m_MCContext_TerminateAllThreads;
 	PLibMCMCContext_LoadClientPackagePtr m_MCContext_LoadClientPackage;
 	PLibMCMCContext_LogPtr m_MCContext_Log;
-	PLibMCMCContext_HandleAPIGetRequestPtr m_MCContext_HandleAPIGetRequest;
-	PLibMCMCContext_HandleAPIPostRequestPtr m_MCContext_HandleAPIPostRequest;
+	PLibMCMCContext_CreateAPIRequestHandlerPtr m_MCContext_CreateAPIRequestHandler;
 	PLibMCGetVersionPtr m_GetVersion;
 	PLibMCGetLastErrorPtr m_GetLastError;
 	PLibMCReleaseInstancePtr m_ReleaseInstance;
diff --git a/Framework/HeadersCore/CppDynamic/libmc_dynamic.hpp b/Framework/HeadersCore/CppDynamic/libmc_dynamic.hpp
index fdc18413..536c9eb3 100644
--- a/Framework/HeadersCore/CppDynamic/libmc_dynamic.hpp
+++ b/Framework/HeadersCore/CppDynamic/libmc_dynamic.hpp
@@ -61,7 +61,7 @@ namespace LibMC {
 **************************************************************************************************************************/
 class CWrapper;
 class CBase;
-class CAPIResponse;
+class CAPIRequestHandler;
 class CMCContext;
 
 /*************************************************************************************************************************
@@ -69,7 +69,7 @@ class CMCContext;
 **************************************************************************************************************************/
 typedef CWrapper CLibMCWrapper;
 typedef CBase CLibMCBase;
-typedef CAPIResponse CLibMCAPIResponse;
+typedef CAPIRequestHandler CLibMCAPIRequestHandler;
 typedef CMCContext CLibMCMCContext;
 
 /*************************************************************************************************************************
@@ -77,7 +77,7 @@ typedef CMCContext CLibMCMCContext;
 **************************************************************************************************************************/
 typedef std::shared_ptr<CWrapper> PWrapper;
 typedef std::shared_ptr<CBase> PBase;
-typedef std::shared_ptr<CAPIResponse> PAPIResponse;
+typedef std::shared_ptr<CAPIRequestHandler> PAPIRequestHandler;
 typedef std::shared_ptr<CMCContext> PMCContext;
 
 /*************************************************************************************************************************
@@ -85,7 +85,7 @@ typedef std::shared_ptr<CMCContext> PMCContext;
 **************************************************************************************************************************/
 typedef PWrapper PLibMCWrapper;
 typedef PBase PLibMCBase;
-typedef PAPIResponse PLibMCAPIResponse;
+typedef PAPIRequestHandler PLibMCAPIRequestHandler;
 typedef PMCContext PLibMCMCContext;
 
 
@@ -263,7 +263,7 @@ class CWrapper {
 	LibMCResult loadWrapperTableFromSymbolLookupMethod(sLibMCDynamicWrapperTable * pWrapperTable, void* pSymbolLookupMethod);
 
 	friend class CBase;
-	friend class CAPIResponse;
+	friend class CAPIRequestHandler;
 	friend class CMCContext;
 
 };
@@ -326,22 +326,26 @@ class CBase {
 };
 	
 /*************************************************************************************************************************
- Class CAPIResponse 
+ Class CAPIRequestHandler 
 **************************************************************************************************************************/
-class CAPIResponse : public CBase {
+class CAPIRequestHandler : public CBase {
 public:
 	
 	/**
-	* CAPIResponse::CAPIResponse - Constructor for APIResponse class.
+	* CAPIRequestHandler::CAPIRequestHandler - Constructor for APIRequestHandler class.
 	*/
-	CAPIResponse(CWrapper* pWrapper, LibMCHandle pHandle)
+	CAPIRequestHandler(CWrapper* pWrapper, LibMCHandle pHandle)
 		: CBase(pWrapper, pHandle)
 	{
 	}
 	
-	inline LibMC_uint32 GetHTTPCode();
-	inline std::string GetContentType();
-	inline void GetData(std::vector<LibMC_uint8> & DataBuffer);
+	inline bool ExpectsRawBody();
+	inline bool ExpectsFormData(LibMC_uint32 & nFieldCount);
+	inline void GetFormDataDetails(const LibMC_uint32 nFieldIndex, std::string & sName, bool & bIsFile, bool & bMandatory);
+	inline void SetFormDataField(const std::string & sName, const CInputVector<LibMC_uint8> & DataFieldBuffer);
+	inline void SetFormStringField(const std::string & sName, const std::string & sString);
+	inline void Handle(const CInputVector<LibMC_uint8> & RawBodyBuffer, std::string & sContentType, LibMC_uint32 & nHTTPCode);
+	inline void GetResultData(std::vector<LibMC_uint8> & DataBuffer);
 };
 	
 /*************************************************************************************************************************
@@ -364,8 +368,7 @@ class CMCContext : public CBase {
 	inline void TerminateAllThreads();
 	inline void LoadClientPackage(const CInputVector<LibMC_uint8> & ZIPStreamBuffer);
 	inline void Log(const std::string & sMessage, const eLogSubSystem eSubsystem, const eLogLevel eLogLevel);
-	inline PAPIResponse HandleAPIGetRequest(const std::string & sURI);
-	inline PAPIResponse HandleAPIPostRequest(const std::string & sURI, const CInputVector<LibMC_uint8> & BodyBuffer);
+	inline PAPIRequestHandler CreateAPIRequestHandler(const std::string & sURI, const std::string & sRequestMethod);
 };
 	
 	/**
@@ -475,17 +478,20 @@ class CMCContext : public CBase {
 			return LIBMC_ERROR_INVALIDPARAM;
 		
 		pWrapperTable->m_LibraryHandle = nullptr;
-		pWrapperTable->m_APIResponse_GetHTTPCode = nullptr;
-		pWrapperTable->m_APIResponse_GetContentType = nullptr;
-		pWrapperTable->m_APIResponse_GetData = nullptr;
+		pWrapperTable->m_APIRequestHandler_ExpectsRawBody = nullptr;
+		pWrapperTable->m_APIRequestHandler_ExpectsFormData = nullptr;
+		pWrapperTable->m_APIRequestHandler_GetFormDataDetails = nullptr;
+		pWrapperTable->m_APIRequestHandler_SetFormDataField = nullptr;
+		pWrapperTable->m_APIRequestHandler_SetFormStringField = nullptr;
+		pWrapperTable->m_APIRequestHandler_Handle = nullptr;
+		pWrapperTable->m_APIRequestHandler_GetResultData = nullptr;
 		pWrapperTable->m_MCContext_RegisterLibraryPath = nullptr;
 		pWrapperTable->m_MCContext_ParseConfiguration = nullptr;
 		pWrapperTable->m_MCContext_StartAllThreads = nullptr;
 		pWrapperTable->m_MCContext_TerminateAllThreads = nullptr;
 		pWrapperTable->m_MCContext_LoadClientPackage = nullptr;
 		pWrapperTable->m_MCContext_Log = nullptr;
-		pWrapperTable->m_MCContext_HandleAPIGetRequest = nullptr;
-		pWrapperTable->m_MCContext_HandleAPIPostRequest = nullptr;
+		pWrapperTable->m_MCContext_CreateAPIRequestHandler = nullptr;
 		pWrapperTable->m_GetVersion = nullptr;
 		pWrapperTable->m_GetLastError = nullptr;
 		pWrapperTable->m_ReleaseInstance = nullptr;
@@ -541,30 +547,66 @@ class CMCContext : public CBase {
 		#endif // _WIN32
 		
 		#ifdef _WIN32
-		pWrapperTable->m_APIResponse_GetHTTPCode = (PLibMCAPIResponse_GetHTTPCodePtr) GetProcAddress(hLibrary, "libmc_apiresponse_gethttpcode");
+		pWrapperTable->m_APIRequestHandler_ExpectsRawBody = (PLibMCAPIRequestHandler_ExpectsRawBodyPtr) GetProcAddress(hLibrary, "libmc_apirequesthandler_expectsrawbody");
 		#else // _WIN32
-		pWrapperTable->m_APIResponse_GetHTTPCode = (PLibMCAPIResponse_GetHTTPCodePtr) dlsym(hLibrary, "libmc_apiresponse_gethttpcode");
+		pWrapperTable->m_APIRequestHandler_ExpectsRawBody = (PLibMCAPIRequestHandler_ExpectsRawBodyPtr) dlsym(hLibrary, "libmc_apirequesthandler_expectsrawbody");
 		dlerror();
 		#endif // _WIN32
-		if (pWrapperTable->m_APIResponse_GetHTTPCode == nullptr)
+		if (pWrapperTable->m_APIRequestHandler_ExpectsRawBody == nullptr)
 			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		#ifdef _WIN32
-		pWrapperTable->m_APIResponse_GetContentType = (PLibMCAPIResponse_GetContentTypePtr) GetProcAddress(hLibrary, "libmc_apiresponse_getcontenttype");
+		pWrapperTable->m_APIRequestHandler_ExpectsFormData = (PLibMCAPIRequestHandler_ExpectsFormDataPtr) GetProcAddress(hLibrary, "libmc_apirequesthandler_expectsformdata");
 		#else // _WIN32
-		pWrapperTable->m_APIResponse_GetContentType = (PLibMCAPIResponse_GetContentTypePtr) dlsym(hLibrary, "libmc_apiresponse_getcontenttype");
+		pWrapperTable->m_APIRequestHandler_ExpectsFormData = (PLibMCAPIRequestHandler_ExpectsFormDataPtr) dlsym(hLibrary, "libmc_apirequesthandler_expectsformdata");
 		dlerror();
 		#endif // _WIN32
-		if (pWrapperTable->m_APIResponse_GetContentType == nullptr)
+		if (pWrapperTable->m_APIRequestHandler_ExpectsFormData == nullptr)
 			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		#ifdef _WIN32
-		pWrapperTable->m_APIResponse_GetData = (PLibMCAPIResponse_GetDataPtr) GetProcAddress(hLibrary, "libmc_apiresponse_getdata");
+		pWrapperTable->m_APIRequestHandler_GetFormDataDetails = (PLibMCAPIRequestHandler_GetFormDataDetailsPtr) GetProcAddress(hLibrary, "libmc_apirequesthandler_getformdatadetails");
 		#else // _WIN32
-		pWrapperTable->m_APIResponse_GetData = (PLibMCAPIResponse_GetDataPtr) dlsym(hLibrary, "libmc_apiresponse_getdata");
+		pWrapperTable->m_APIRequestHandler_GetFormDataDetails = (PLibMCAPIRequestHandler_GetFormDataDetailsPtr) dlsym(hLibrary, "libmc_apirequesthandler_getformdatadetails");
 		dlerror();
 		#endif // _WIN32
-		if (pWrapperTable->m_APIResponse_GetData == nullptr)
+		if (pWrapperTable->m_APIRequestHandler_GetFormDataDetails == nullptr)
+			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_APIRequestHandler_SetFormDataField = (PLibMCAPIRequestHandler_SetFormDataFieldPtr) GetProcAddress(hLibrary, "libmc_apirequesthandler_setformdatafield");
+		#else // _WIN32
+		pWrapperTable->m_APIRequestHandler_SetFormDataField = (PLibMCAPIRequestHandler_SetFormDataFieldPtr) dlsym(hLibrary, "libmc_apirequesthandler_setformdatafield");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_APIRequestHandler_SetFormDataField == nullptr)
+			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_APIRequestHandler_SetFormStringField = (PLibMCAPIRequestHandler_SetFormStringFieldPtr) GetProcAddress(hLibrary, "libmc_apirequesthandler_setformstringfield");
+		#else // _WIN32
+		pWrapperTable->m_APIRequestHandler_SetFormStringField = (PLibMCAPIRequestHandler_SetFormStringFieldPtr) dlsym(hLibrary, "libmc_apirequesthandler_setformstringfield");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_APIRequestHandler_SetFormStringField == nullptr)
+			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_APIRequestHandler_Handle = (PLibMCAPIRequestHandler_HandlePtr) GetProcAddress(hLibrary, "libmc_apirequesthandler_handle");
+		#else // _WIN32
+		pWrapperTable->m_APIRequestHandler_Handle = (PLibMCAPIRequestHandler_HandlePtr) dlsym(hLibrary, "libmc_apirequesthandler_handle");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_APIRequestHandler_Handle == nullptr)
+			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_APIRequestHandler_GetResultData = (PLibMCAPIRequestHandler_GetResultDataPtr) GetProcAddress(hLibrary, "libmc_apirequesthandler_getresultdata");
+		#else // _WIN32
+		pWrapperTable->m_APIRequestHandler_GetResultData = (PLibMCAPIRequestHandler_GetResultDataPtr) dlsym(hLibrary, "libmc_apirequesthandler_getresultdata");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_APIRequestHandler_GetResultData == nullptr)
 			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		#ifdef _WIN32
@@ -622,21 +664,12 @@ class CMCContext : public CBase {
 			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		#ifdef _WIN32
-		pWrapperTable->m_MCContext_HandleAPIGetRequest = (PLibMCMCContext_HandleAPIGetRequestPtr) GetProcAddress(hLibrary, "libmc_mccontext_handleapigetrequest");
-		#else // _WIN32
-		pWrapperTable->m_MCContext_HandleAPIGetRequest = (PLibMCMCContext_HandleAPIGetRequestPtr) dlsym(hLibrary, "libmc_mccontext_handleapigetrequest");
-		dlerror();
-		#endif // _WIN32
-		if (pWrapperTable->m_MCContext_HandleAPIGetRequest == nullptr)
-			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
-		
-		#ifdef _WIN32
-		pWrapperTable->m_MCContext_HandleAPIPostRequest = (PLibMCMCContext_HandleAPIPostRequestPtr) GetProcAddress(hLibrary, "libmc_mccontext_handleapipostrequest");
+		pWrapperTable->m_MCContext_CreateAPIRequestHandler = (PLibMCMCContext_CreateAPIRequestHandlerPtr) GetProcAddress(hLibrary, "libmc_mccontext_createapirequesthandler");
 		#else // _WIN32
-		pWrapperTable->m_MCContext_HandleAPIPostRequest = (PLibMCMCContext_HandleAPIPostRequestPtr) dlsym(hLibrary, "libmc_mccontext_handleapipostrequest");
+		pWrapperTable->m_MCContext_CreateAPIRequestHandler = (PLibMCMCContext_CreateAPIRequestHandlerPtr) dlsym(hLibrary, "libmc_mccontext_createapirequesthandler");
 		dlerror();
 		#endif // _WIN32
-		if (pWrapperTable->m_MCContext_HandleAPIPostRequest == nullptr)
+		if (pWrapperTable->m_MCContext_CreateAPIRequestHandler == nullptr)
 			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		#ifdef _WIN32
@@ -709,16 +742,32 @@ class CMCContext : public CBase {
 		SymbolLookupType pLookup = (SymbolLookupType)pSymbolLookupMethod;
 		
 		LibMCResult eLookupError = LIBMC_SUCCESS;
-		eLookupError = (*pLookup)("libmc_apiresponse_gethttpcode", (void**)&(pWrapperTable->m_APIResponse_GetHTTPCode));
-		if ( (eLookupError != 0) || (pWrapperTable->m_APIResponse_GetHTTPCode == nullptr) )
+		eLookupError = (*pLookup)("libmc_apirequesthandler_expectsrawbody", (void**)&(pWrapperTable->m_APIRequestHandler_ExpectsRawBody));
+		if ( (eLookupError != 0) || (pWrapperTable->m_APIRequestHandler_ExpectsRawBody == nullptr) )
+			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmc_apirequesthandler_expectsformdata", (void**)&(pWrapperTable->m_APIRequestHandler_ExpectsFormData));
+		if ( (eLookupError != 0) || (pWrapperTable->m_APIRequestHandler_ExpectsFormData == nullptr) )
+			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmc_apirequesthandler_getformdatadetails", (void**)&(pWrapperTable->m_APIRequestHandler_GetFormDataDetails));
+		if ( (eLookupError != 0) || (pWrapperTable->m_APIRequestHandler_GetFormDataDetails == nullptr) )
+			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmc_apirequesthandler_setformdatafield", (void**)&(pWrapperTable->m_APIRequestHandler_SetFormDataField));
+		if ( (eLookupError != 0) || (pWrapperTable->m_APIRequestHandler_SetFormDataField == nullptr) )
 			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
-		eLookupError = (*pLookup)("libmc_apiresponse_getcontenttype", (void**)&(pWrapperTable->m_APIResponse_GetContentType));
-		if ( (eLookupError != 0) || (pWrapperTable->m_APIResponse_GetContentType == nullptr) )
+		eLookupError = (*pLookup)("libmc_apirequesthandler_setformstringfield", (void**)&(pWrapperTable->m_APIRequestHandler_SetFormStringField));
+		if ( (eLookupError != 0) || (pWrapperTable->m_APIRequestHandler_SetFormStringField == nullptr) )
 			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
-		eLookupError = (*pLookup)("libmc_apiresponse_getdata", (void**)&(pWrapperTable->m_APIResponse_GetData));
-		if ( (eLookupError != 0) || (pWrapperTable->m_APIResponse_GetData == nullptr) )
+		eLookupError = (*pLookup)("libmc_apirequesthandler_handle", (void**)&(pWrapperTable->m_APIRequestHandler_Handle));
+		if ( (eLookupError != 0) || (pWrapperTable->m_APIRequestHandler_Handle == nullptr) )
+			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmc_apirequesthandler_getresultdata", (void**)&(pWrapperTable->m_APIRequestHandler_GetResultData));
+		if ( (eLookupError != 0) || (pWrapperTable->m_APIRequestHandler_GetResultData == nullptr) )
 			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		eLookupError = (*pLookup)("libmc_mccontext_registerlibrarypath", (void**)&(pWrapperTable->m_MCContext_RegisterLibraryPath));
@@ -745,12 +794,8 @@ class CMCContext : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_MCContext_Log == nullptr) )
 			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
-		eLookupError = (*pLookup)("libmc_mccontext_handleapigetrequest", (void**)&(pWrapperTable->m_MCContext_HandleAPIGetRequest));
-		if ( (eLookupError != 0) || (pWrapperTable->m_MCContext_HandleAPIGetRequest == nullptr) )
-			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
-		
-		eLookupError = (*pLookup)("libmc_mccontext_handleapipostrequest", (void**)&(pWrapperTable->m_MCContext_HandleAPIPostRequest));
-		if ( (eLookupError != 0) || (pWrapperTable->m_MCContext_HandleAPIPostRequest == nullptr) )
+		eLookupError = (*pLookup)("libmc_mccontext_createapirequesthandler", (void**)&(pWrapperTable->m_MCContext_CreateAPIRequestHandler));
+		if ( (eLookupError != 0) || (pWrapperTable->m_MCContext_CreateAPIRequestHandler == nullptr) )
 			return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		eLookupError = (*pLookup)("libmc_getversion", (void**)&(pWrapperTable->m_GetVersion));
@@ -787,47 +832,98 @@ class CMCContext : public CBase {
 	 */
 	
 	/**
-	 * Method definitions for class CAPIResponse
+	 * Method definitions for class CAPIRequestHandler
 	 */
 	
 	/**
-	* CAPIResponse::GetHTTPCode - returns the HTTP Errorcode to set (200 for success).
-	* @return HTTP Code
+	* CAPIRequestHandler::ExpectsRawBody - checks if the raw body is needed to handle the request.
+	* @return Flag, if the raw body is needed in the request.
+	*/
+	bool CAPIRequestHandler::ExpectsRawBody()
+	{
+		bool resultValue = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_APIRequestHandler_ExpectsRawBody(m_pHandle, &resultValue));
+		
+		return resultValue;
+	}
+	
+	/**
+	* CAPIRequestHandler::ExpectsFormData - checks if the parsed form data is needed to handle the request.
+	* @param[out] nFieldCount - Number of Form Data entries that are expected.
+	* @return Flag, if the parsed form data is needed in the request.
 	*/
-	LibMC_uint32 CAPIResponse::GetHTTPCode()
+	bool CAPIRequestHandler::ExpectsFormData(LibMC_uint32 & nFieldCount)
 	{
-		LibMC_uint32 resultHTTPCode = 0;
-		CheckError(m_pWrapper->m_WrapperTable.m_APIResponse_GetHTTPCode(m_pHandle, &resultHTTPCode));
+		bool resultValue = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_APIRequestHandler_ExpectsFormData(m_pHandle, &nFieldCount, &resultValue));
 		
-		return resultHTTPCode;
+		return resultValue;
 	}
 	
 	/**
-	* CAPIResponse::GetContentType - returns the content type string of the data.
-	* @return Content Type.
+	* CAPIRequestHandler::GetFormDataDetails - returns details of expected form data.
+	* @param[in] nFieldIndex - Index of Form Data Field (0..FieldCount - 1)
+	* @param[out] sName - Name of the expected form data field.
+	* @param[out] bIsFile - Flag, if the field Is a file field.
+	* @param[out] bMandatory - Flag, if the field MUST be present.
 	*/
-	std::string CAPIResponse::GetContentType()
+	void CAPIRequestHandler::GetFormDataDetails(const LibMC_uint32 nFieldIndex, std::string & sName, bool & bIsFile, bool & bMandatory)
+	{
+		LibMC_uint32 bytesNeededName = 0;
+		LibMC_uint32 bytesWrittenName = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_APIRequestHandler_GetFormDataDetails(m_pHandle, nFieldIndex, 0, &bytesNeededName, nullptr, &bIsFile, &bMandatory));
+		std::vector<char> bufferName(bytesNeededName);
+		CheckError(m_pWrapper->m_WrapperTable.m_APIRequestHandler_GetFormDataDetails(m_pHandle, nFieldIndex, bytesNeededName, &bytesWrittenName, &bufferName[0], &bIsFile, &bMandatory));
+		sName = std::string(&bufferName[0]);
+	}
+	
+	/**
+	* CAPIRequestHandler::SetFormDataField - passes the a form data field to the request handler. Call only, if ExpectsFormData returns true.
+	* @param[in] sName - Name of the form data field.
+	* @param[in] DataFieldBuffer - DataField that was sent.
+	*/
+	void CAPIRequestHandler::SetFormDataField(const std::string & sName, const CInputVector<LibMC_uint8> & DataFieldBuffer)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_APIRequestHandler_SetFormDataField(m_pHandle, sName.c_str(), (LibMC_uint64)DataFieldBuffer.size(), DataFieldBuffer.data()));
+	}
+	
+	/**
+	* CAPIRequestHandler::SetFormStringField - passes the a form string field to the request handler. Call only, if ExpectsFormData returns true.
+	* @param[in] sName - Name of the form data field.
+	* @param[in] sString - DataString that was sent.
+	*/
+	void CAPIRequestHandler::SetFormStringField(const std::string & sName, const std::string & sString)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_APIRequestHandler_SetFormStringField(m_pHandle, sName.c_str(), sString.c_str()));
+	}
+	
+	/**
+	* CAPIRequestHandler::Handle - handles the request.
+	* @param[in] RawBodyBuffer - Raw Body that was sent. Only necessary, if ExpectsRawBody returns true.
+	* @param[out] sContentType - the resulting Content Type String of the data.
+	* @param[out] nHTTPCode - the resulting HTTP Errorcode (200 for success).
+	*/
+	void CAPIRequestHandler::Handle(const CInputVector<LibMC_uint8> & RawBodyBuffer, std::string & sContentType, LibMC_uint32 & nHTTPCode)
 	{
 		LibMC_uint32 bytesNeededContentType = 0;
 		LibMC_uint32 bytesWrittenContentType = 0;
-		CheckError(m_pWrapper->m_WrapperTable.m_APIResponse_GetContentType(m_pHandle, 0, &bytesNeededContentType, nullptr));
+		CheckError(m_pWrapper->m_WrapperTable.m_APIRequestHandler_Handle(m_pHandle, (LibMC_uint64)RawBodyBuffer.size(), RawBodyBuffer.data(), 0, &bytesNeededContentType, nullptr, &nHTTPCode));
 		std::vector<char> bufferContentType(bytesNeededContentType);
-		CheckError(m_pWrapper->m_WrapperTable.m_APIResponse_GetContentType(m_pHandle, bytesNeededContentType, &bytesWrittenContentType, &bufferContentType[0]));
-		
-		return std::string(&bufferContentType[0]);
+		CheckError(m_pWrapper->m_WrapperTable.m_APIRequestHandler_Handle(m_pHandle, (LibMC_uint64)RawBodyBuffer.size(), RawBodyBuffer.data(), bytesNeededContentType, &bytesWrittenContentType, &bufferContentType[0], &nHTTPCode));
+		sContentType = std::string(&bufferContentType[0]);
 	}
 	
 	/**
-	* CAPIResponse::GetData - returns the stream content of the data.
+	* CAPIRequestHandler::GetResultData - returns the cached stream content of the resulting data. Call only after Handle().
 	* @param[out] DataBuffer - Binary stream data
 	*/
-	void CAPIResponse::GetData(std::vector<LibMC_uint8> & DataBuffer)
+	void CAPIRequestHandler::GetResultData(std::vector<LibMC_uint8> & DataBuffer)
 	{
 		LibMC_uint64 elementsNeededData = 0;
 		LibMC_uint64 elementsWrittenData = 0;
-		CheckError(m_pWrapper->m_WrapperTable.m_APIResponse_GetData(m_pHandle, 0, &elementsNeededData, nullptr));
+		CheckError(m_pWrapper->m_WrapperTable.m_APIRequestHandler_GetResultData(m_pHandle, 0, &elementsNeededData, nullptr));
 		DataBuffer.resize((size_t) elementsNeededData);
-		CheckError(m_pWrapper->m_WrapperTable.m_APIResponse_GetData(m_pHandle, elementsNeededData, &elementsWrittenData, DataBuffer.data()));
+		CheckError(m_pWrapper->m_WrapperTable.m_APIRequestHandler_GetResultData(m_pHandle, elementsNeededData, &elementsWrittenData, DataBuffer.data()));
 	}
 	
 	/**
@@ -890,36 +986,20 @@ class CMCContext : public CBase {
 	}
 	
 	/**
-	* CMCContext::HandleAPIGetRequest - handle an API GET request.
-	* @param[in] sURI - URI to serve
-	* @return Response instance.
-	*/
-	PAPIResponse CMCContext::HandleAPIGetRequest(const std::string & sURI)
-	{
-		LibMCHandle hResponse = nullptr;
-		CheckError(m_pWrapper->m_WrapperTable.m_MCContext_HandleAPIGetRequest(m_pHandle, sURI.c_str(), &hResponse));
-		
-		if (!hResponse) {
-			CheckError(LIBMC_ERROR_INVALIDPARAM);
-		}
-		return std::make_shared<CAPIResponse>(m_pWrapper, hResponse);
-	}
-	
-	/**
-	* CMCContext::HandleAPIPostRequest - handle an API POST request.
+	* CMCContext::CreateAPIRequestHandler - creates an API request handler.
 	* @param[in] sURI - URI to serve
-	* @param[in] BodyBuffer - Body that was sent.
-	* @return Response instance.
+	* @param[in] sRequestMethod - Request Method
+	* @return Request Handler instance.
 	*/
-	PAPIResponse CMCContext::HandleAPIPostRequest(const std::string & sURI, const CInputVector<LibMC_uint8> & BodyBuffer)
+	PAPIRequestHandler CMCContext::CreateAPIRequestHandler(const std::string & sURI, const std::string & sRequestMethod)
 	{
-		LibMCHandle hResponse = nullptr;
-		CheckError(m_pWrapper->m_WrapperTable.m_MCContext_HandleAPIPostRequest(m_pHandle, sURI.c_str(), (LibMC_uint64)BodyBuffer.size(), BodyBuffer.data(), &hResponse));
+		LibMCHandle hHandlerInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_MCContext_CreateAPIRequestHandler(m_pHandle, sURI.c_str(), sRequestMethod.c_str(), &hHandlerInstance));
 		
-		if (!hResponse) {
+		if (!hHandlerInstance) {
 			CheckError(LIBMC_ERROR_INVALIDPARAM);
 		}
-		return std::make_shared<CAPIResponse>(m_pWrapper, hResponse);
+		return std::make_shared<CAPIRequestHandler>(m_pWrapper, hHandlerInstance);
 	}
 
 } // namespace LibMC
diff --git a/Framework/HeadersCore/CppDynamic/libmc_types.hpp b/Framework/HeadersCore/CppDynamic/libmc_types.hpp
index f167a9db..47324762 100644
--- a/Framework/HeadersCore/CppDynamic/libmc_types.hpp
+++ b/Framework/HeadersCore/CppDynamic/libmc_types.hpp
@@ -266,6 +266,46 @@ typedef void * LibMC_pvoid;
 #define LIBMC_ERROR_DUPLICATESTORAGESTREAM 239
 #define LIBMC_ERROR_INVALIDPARTIALUPLOAD 240
 #define LIBMC_ERROR_PARTIALUPLOADNOTFINISHED 241
+#define LIBMC_ERROR_APIREQUESTNOTHANDLED 242
+#define LIBMC_ERROR_APIREQUESTALREADYHANDLED 243
+#define LIBMC_ERROR_INVALIDAPIREQUESTTYPE 244
+#define LIBMC_ERROR_INVALIDUPLOADSTREAM 245
+#define LIBMC_ERROR_COULDNOTPARSEJSONREQUEST 246
+#define LIBMC_ERROR_INVALIDCONTEXTUUID 247
+#define LIBMC_ERROR_INVALIDUPLOADNAME 248
+#define LIBMC_ERROR_INVALIDMIMETYPE 249
+#define LIBMC_ERROR_INVALIDSTREAMSIZE 250
+#define LIBMC_ERROR_INVALIDSHA256SUM 251
+#define LIBMC_ERROR_INVALIDSTREAMUUID 252
+#define LIBMC_ERROR_INVALIDFIELDNAME 253
+#define LIBMC_ERROR_UPLOADSIZEMISMATCH 254
+#define LIBMC_ERROR_CONTENTTYPENOTACCEPTED 255
+#define LIBMC_ERROR_NOCURRENTUPLOAD 256
+#define LIBMC_ERROR_UPLOADCHECKSUMMISMATCH 257
+#define LIBMC_ERROR_INVALIDSTORAGESTREAMSTATUS 258
+#define LIBMC_ERROR_CONTEXTUUIDNOTACCEPTED 259
+#define LIBMC_ERROR_INVALIDBUILDUUID 260
+#define LIBMC_ERROR_MISSINGTHREADCOUNT 261
+#define LIBMC_ERROR_INVALIDTHREADCOUNT 262
+#define LIBMC_ERROR_COULDNOTUPDATEBUILDSTATUS 263
+#define LIBMC_ERROR_INVALIDITERATOR 264
+#define LIBMC_ERROR_INVALIDDATATYPE 265
+#define LIBMC_ERROR_COULDNOTSENDSIGNAL 266
+#define LIBMC_ERROR_MISSINGSIGNALPARAMETER 267
+#define LIBMC_ERROR_NOUSERINTERFACEDEFINITION 268
+#define LIBMC_ERROR_MISSINGAPPNAME 269
+#define LIBMC_ERROR_MISSINGCOPYRIGHT 270
+#define LIBMC_ERROR_MISSINGMAINPAGE 271
+#define LIBMC_ERROR_MISSINGMENUITEMID 272
+#define LIBMC_ERROR_MISSINGMENUITEMICON 273
+#define LIBMC_ERROR_MISSINGMENUITEMCAPTION 274
+#define LIBMC_ERROR_MISSINGTARGETPAGE 275
+#define LIBMC_ERROR_MISSINGMENUNODE 276
+#define LIBMC_ERROR_MISSINGTOOLBARNODE 277
+#define LIBMC_ERROR_MISSINGTOOLBARITEMID 278
+#define LIBMC_ERROR_MISSINGTOOLBARITEMICON 279
+#define LIBMC_ERROR_MISSINGTOOLBARITEMCAPTION 280
+#define LIBMC_ERROR_MISSINGSERVICESNODE 281
 
 /*************************************************************************************************************************
  Error strings for LibMC
@@ -444,6 +484,46 @@ inline const char * LIBMC_GETERRORSTRING (LibMCResult nErrorCode) {
     case LIBMC_ERROR_DUPLICATESTORAGESTREAM: return "Duplicate Storage Stream";
     case LIBMC_ERROR_INVALIDPARTIALUPLOAD: return "Invalid Partial Upload";
     case LIBMC_ERROR_PARTIALUPLOADNOTFINISHED: return "Partial Upload not finished";
+    case LIBMC_ERROR_APIREQUESTNOTHANDLED: return "API Request not handled";
+    case LIBMC_ERROR_APIREQUESTALREADYHANDLED: return "API Request already handled";
+    case LIBMC_ERROR_INVALIDAPIREQUESTTYPE: return "Invalid API Request type";
+    case LIBMC_ERROR_INVALIDUPLOADSTREAM: return "Invalid Upload Stream";
+    case LIBMC_ERROR_COULDNOTPARSEJSONREQUEST: return "Could not parse JSON request";
+    case LIBMC_ERROR_INVALIDCONTEXTUUID: return "Invalid Context UUID";
+    case LIBMC_ERROR_INVALIDUPLOADNAME: return "Invalid Upload Name";
+    case LIBMC_ERROR_INVALIDMIMETYPE: return "Invalid Mime Type";
+    case LIBMC_ERROR_INVALIDSTREAMSIZE: return "Invalid Stream Size";
+    case LIBMC_ERROR_INVALIDSHA256SUM: return "Invalid SHA256 Sum";
+    case LIBMC_ERROR_INVALIDSTREAMUUID: return "Invalid Stream UUID";
+    case LIBMC_ERROR_INVALIDFIELDNAME: return "Invalid field name";
+    case LIBMC_ERROR_UPLOADSIZEMISMATCH: return "Upload size mismatch";
+    case LIBMC_ERROR_CONTENTTYPENOTACCEPTED: return "Content type not accepted";
+    case LIBMC_ERROR_NOCURRENTUPLOAD: return "No current upload";
+    case LIBMC_ERROR_UPLOADCHECKSUMMISMATCH: return "Upload checksum mismatch";
+    case LIBMC_ERROR_INVALIDSTORAGESTREAMSTATUS: return "Invalid storage stream status";
+    case LIBMC_ERROR_CONTEXTUUIDNOTACCEPTED: return "Context uuid not accepted";
+    case LIBMC_ERROR_INVALIDBUILDUUID: return "Invalid build uuid";
+    case LIBMC_ERROR_MISSINGTHREADCOUNT: return "Missing thread count";
+    case LIBMC_ERROR_INVALIDTHREADCOUNT: return "Invalid thread count";
+    case LIBMC_ERROR_COULDNOTUPDATEBUILDSTATUS: return "Could not update build status";
+    case LIBMC_ERROR_INVALIDITERATOR: return "Invalid iterator";
+    case LIBMC_ERROR_INVALIDDATATYPE: return "Invalid data type";
+    case LIBMC_ERROR_COULDNOTSENDSIGNAL: return "Could not send signal";
+    case LIBMC_ERROR_MISSINGSIGNALPARAMETER: return "Missing signal parameter";
+    case LIBMC_ERROR_NOUSERINTERFACEDEFINITION: return "No user interface definition";
+    case LIBMC_ERROR_MISSINGAPPNAME: return "Missing app name";
+    case LIBMC_ERROR_MISSINGCOPYRIGHT: return "Missing copyright";
+    case LIBMC_ERROR_MISSINGMAINPAGE: return "Missing main page";
+    case LIBMC_ERROR_MISSINGMENUITEMID: return "Missing menu item id";
+    case LIBMC_ERROR_MISSINGMENUITEMICON: return "Missing menu item icon";
+    case LIBMC_ERROR_MISSINGMENUITEMCAPTION: return "Missing menu item caption";
+    case LIBMC_ERROR_MISSINGTARGETPAGE: return "Missing menu item target page";
+    case LIBMC_ERROR_MISSINGMENUNODE: return "Missing menu node";
+    case LIBMC_ERROR_MISSINGTOOLBARNODE: return "Missing toolbar node";
+    case LIBMC_ERROR_MISSINGTOOLBARITEMID: return "Missing toolbar item id";
+    case LIBMC_ERROR_MISSINGTOOLBARITEMICON: return "Missing toolbar item icon";
+    case LIBMC_ERROR_MISSINGTOOLBARITEMCAPTION: return "Missing toolbar item caption";
+    case LIBMC_ERROR_MISSINGSERVICESNODE: return "Missing services node";
     default: return "unknown error";
   }
 }
@@ -453,7 +533,7 @@ inline const char * LIBMC_GETERRORSTRING (LibMCResult nErrorCode) {
 **************************************************************************************************************************/
 
 typedef LibMCHandle LibMC_Base;
-typedef LibMCHandle LibMC_APIResponse;
+typedef LibMCHandle LibMC_APIRequestHandler;
 typedef LibMCHandle LibMC_MCContext;
 
 namespace LibMC {
diff --git a/Framework/HeadersCore/CppDynamic/libmcdata_abi.hpp b/Framework/HeadersCore/CppDynamic/libmcdata_abi.hpp
index 5a27f161..4876897a 100644
--- a/Framework/HeadersCore/CppDynamic/libmcdata_abi.hpp
+++ b/Framework/HeadersCore/CppDynamic/libmcdata_abi.hpp
@@ -140,17 +140,6 @@ LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_logsession_addentry(LibMCData_LogSe
 */
 LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_storagestream_getuuid(LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nUUIDBufferSize, LibMCData_uint32* pUUIDNeededChars, char * pUUIDBuffer);
 
-/**
-* returns the context uuid of a storage stream. Context might be for example a project uuid that this stream is part of.
-*
-* @param[in] pStorageStream - StorageStream instance.
-* @param[in] nContextUUIDBufferSize - size of the buffer (including trailing 0)
-* @param[out] pContextUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
-* @param[out] pContextUUIDBuffer -  buffer of UUID String, may be NULL
-* @return error code or 0 (success)
-*/
-LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_storagestream_getcontextuuid(LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nContextUUIDBufferSize, LibMCData_uint32* pContextUUIDNeededChars, char * pContextUUIDBuffer);
-
 /**
 * returns the timestamp of a storage stream.
 *
@@ -301,6 +290,93 @@ LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_storage_storepartialstream(LibMCDat
 */
 LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_storage_finishpartialstream(LibMCData_Storage pStorage, const char * pUUID);
 
+/**
+* Returns the maximum stream size that the data model allows.
+*
+* @param[in] pStorage - Storage instance.
+* @param[out] pMaxStreamSize - Maximum Stream Size in Bytes.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_storage_getmaxstreamsize(LibMCData_Storage pStorage, LibMCData_uint64 * pMaxStreamSize);
+
+/**
+* Returns if the given content type is an acceptable value.
+*
+* @param[in] pStorage - Storage instance.
+* @param[in] pContentType - Content type string (is taken case-insensitive)
+* @param[out] pAccepted - Content type is accepted.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_storage_contenttypeisaccepted(LibMCData_Storage pStorage, const char * pContentType, bool * pAccepted);
+
+/*************************************************************************************************************************
+ Class definition for BuildJobData
+**************************************************************************************************************************/
+
+/**
+* returns the name of a build job.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name String, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobdata_getname(LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nNameBufferSize, LibMCData_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* returns the timestamp when the job was created.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[in] nTimestampBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTimestampNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTimestampBuffer -  buffer of Timestamp in ISO8601 UTC format, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobdata_gettimestamp(LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nTimestampBufferSize, LibMCData_uint32* pTimestampNeededChars, char * pTimestampBuffer);
+
+/**
+* returns the storage stream of the build.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[out] pStreamInstance - Stream Instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobdata_getstoragestream(LibMCData_BuildJobData pBuildJobData, LibMCData_StorageStream * pStreamInstance);
+
+/**
+* returns the data type of the job data.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[out] pDataType - Data type of the job data
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobdata_getdatatype(LibMCData_BuildJobData pBuildJobData, LibMCData::eBuildJobDataType * pDataType);
+
+/**
+* returns the mime type of a storage stream.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[in] nMimeTypeBufferSize - size of the buffer (including trailing 0)
+* @param[out] pMimeTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pMimeTypeBuffer -  buffer of Mime Type String, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobdata_getmimetype(LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nMimeTypeBufferSize, LibMCData_uint32* pMimeTypeNeededChars, char * pMimeTypeBuffer);
+
+/*************************************************************************************************************************
+ Class definition for BuildJobDataIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the build job data the iterator points at.
+*
+* @param[in] pBuildJobDataIterator - BuildJobDataIterator instance.
+* @param[out] pCurrentInstance - returns the build job instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobdataiterator_getcurrentjobdata(LibMCData_BuildJobDataIterator pBuildJobDataIterator, LibMCData_BuildJobData * pCurrentInstance);
+
 /*************************************************************************************************************************
  Class definition for BuildJob
 **************************************************************************************************************************/
@@ -336,6 +412,15 @@ LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_getname(LibMCData_BuildJob
 */
 LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_getstatus(LibMCData_BuildJob pBuildJob, LibMCData::eBuildJobStatus * pStatus);
 
+/**
+* returns the layer count of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pLayerCount - Layer Count of build job
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_getlayercount(LibMCData_BuildJob pBuildJob, LibMCData_uint32 * pLayerCount);
+
 /**
 * returns the timestamp when the job was created.
 *
@@ -356,6 +441,17 @@ LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_gettimestamp(LibMCData_Bui
 */
 LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_getstoragestream(LibMCData_BuildJob pBuildJob, LibMCData_StorageStream * pStreamInstance);
 
+/**
+* returns the storage stream uuid of the build.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] nStreamUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pStreamUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pStreamUUIDBuffer -  buffer of Stream UUID., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_getstoragestreamuuid(LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nStreamUUIDBufferSize, LibMCData_uint32* pStreamUUIDNeededChars, char * pStreamUUIDBuffer);
+
 /**
 * creates a build job log session access class.
 *
@@ -365,6 +461,87 @@ LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_getstoragestream(LibMCData
 */
 LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_getbuildjoblogger(LibMCData_BuildJob pBuildJob, LibMCData_LogSession * pLogSession);
 
+/**
+* Starts validation of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_startvalidating(LibMCData_BuildJob pBuildJob);
+
+/**
+* Finishes validation of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] nLayerCount - Layer count
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_finishvalidating(LibMCData_BuildJob pBuildJob, LibMCData_uint32 nLayerCount);
+
+/**
+* Archives a Job. Job MUST not be opened in the system. Job MUST be of state validated.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_archivejob(LibMCData_BuildJob pBuildJob);
+
+/**
+* Unarchives a Job. Job MUST be of state archived.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_unarchivejob(LibMCData_BuildJob pBuildJob);
+
+/**
+* Deletes a Job permanently including all referencing data objects. Job MUST be of state archived to succeed.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_deletejob(LibMCData_BuildJob pBuildJob);
+
+/**
+* Returns if a job is opened.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pCanBeArchived - returns if the job can be archived.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_jobcanbearchived(LibMCData_BuildJob pBuildJob, bool * pCanBeArchived);
+
+/**
+* Adds additional data to the Job. Job MUST be of state validated in order to add job data.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] pName - Name of the job
+* @param[in] pStream - Storage Stream Instance
+* @param[in] eDataType - Datatype of Job data
+* @param[in] pUserID - Currently authenticated user
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_addjobdata(LibMCData_BuildJob pBuildJob, const char * pName, LibMCData_StorageStream pStream, LibMCData::eBuildJobDataType eDataType, const char * pUserID);
+
+/**
+* Retrieves a list of build job data objects, filtered by type.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] eDataType - Datatype of Job data.
+* @param[out] pIteratorInstance - Build Job Data Iterator Instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_listjobdatabytype(LibMCData_BuildJob pBuildJob, LibMCData::eBuildJobDataType eDataType, LibMCData_BuildJobDataIterator * pIteratorInstance);
+
+/**
+* Retrieves a list of build job data objects.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pIteratorInstance - Build Job Data Iterator Instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_listjobdata(LibMCData_BuildJob pBuildJob, LibMCData_BuildJobDataIterator * pIteratorInstance);
+
 /*************************************************************************************************************************
  Class definition for BuildJobIterator
 **************************************************************************************************************************/
@@ -389,11 +566,11 @@ LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobiterator_getcurrentjob(LibM
 * @param[in] pJobUUID - UUID String for the build job. Must be unique and newly generated.
 * @param[in] pName - Name String
 * @param[in] pUserID - Currently authenticated user
-* @param[in] pStreamInstance - Storage stream to create the job from. ContextUUID of Stream MUST be the Job UUID.
+* @param[in] pStorageStreamUUID - Storage stream uuid for the job. Needs not exist yet.
 * @param[out] pJobInstance - Build Job Instance.
 * @return error code or 0 (success)
 */
-LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobhandler_createjob(LibMCData_BuildJobHandler pBuildJobHandler, const char * pJobUUID, const char * pName, const char * pUserID, LibMCData_StorageStream pStreamInstance, LibMCData_BuildJob * pJobInstance);
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobhandler_createjob(LibMCData_BuildJobHandler pBuildJobHandler, const char * pJobUUID, const char * pName, const char * pUserID, const char * pStorageStreamUUID, LibMCData_BuildJob * pJobInstance);
 
 /**
 * Retrieves a job with a specific UUID.
diff --git a/Framework/HeadersCore/CppDynamic/libmcdata_dynamic.h b/Framework/HeadersCore/CppDynamic/libmcdata_dynamic.h
index c23238c3..d0cdc7a0 100644
--- a/Framework/HeadersCore/CppDynamic/libmcdata_dynamic.h
+++ b/Framework/HeadersCore/CppDynamic/libmcdata_dynamic.h
@@ -127,17 +127,6 @@ typedef LibMCDataResult (*PLibMCDataLogSession_AddEntryPtr) (LibMCData_LogSessio
 */
 typedef LibMCDataResult (*PLibMCDataStorageStream_GetUUIDPtr) (LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nUUIDBufferSize, LibMCData_uint32* pUUIDNeededChars, char * pUUIDBuffer);
 
-/**
-* returns the context uuid of a storage stream. Context might be for example a project uuid that this stream is part of.
-*
-* @param[in] pStorageStream - StorageStream instance.
-* @param[in] nContextUUIDBufferSize - size of the buffer (including trailing 0)
-* @param[out] pContextUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
-* @param[out] pContextUUIDBuffer -  buffer of UUID String, may be NULL
-* @return error code or 0 (success)
-*/
-typedef LibMCDataResult (*PLibMCDataStorageStream_GetContextUUIDPtr) (LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nContextUUIDBufferSize, LibMCData_uint32* pContextUUIDNeededChars, char * pContextUUIDBuffer);
-
 /**
 * returns the timestamp of a storage stream.
 *
@@ -288,6 +277,93 @@ typedef LibMCDataResult (*PLibMCDataStorage_StorePartialStreamPtr) (LibMCData_St
 */
 typedef LibMCDataResult (*PLibMCDataStorage_FinishPartialStreamPtr) (LibMCData_Storage pStorage, const char * pUUID);
 
+/**
+* Returns the maximum stream size that the data model allows.
+*
+* @param[in] pStorage - Storage instance.
+* @param[out] pMaxStreamSize - Maximum Stream Size in Bytes.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorage_GetMaxStreamSizePtr) (LibMCData_Storage pStorage, LibMCData_uint64 * pMaxStreamSize);
+
+/**
+* Returns if the given content type is an acceptable value.
+*
+* @param[in] pStorage - Storage instance.
+* @param[in] pContentType - Content type string (is taken case-insensitive)
+* @param[out] pAccepted - Content type is accepted.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorage_ContentTypeIsAcceptedPtr) (LibMCData_Storage pStorage, const char * pContentType, bool * pAccepted);
+
+/*************************************************************************************************************************
+ Class definition for BuildJobData
+**************************************************************************************************************************/
+
+/**
+* returns the name of a build job.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name String, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobData_GetNamePtr) (LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nNameBufferSize, LibMCData_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* returns the timestamp when the job was created.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[in] nTimestampBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTimestampNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTimestampBuffer -  buffer of Timestamp in ISO8601 UTC format, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobData_GetTimeStampPtr) (LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nTimestampBufferSize, LibMCData_uint32* pTimestampNeededChars, char * pTimestampBuffer);
+
+/**
+* returns the storage stream of the build.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[out] pStreamInstance - Stream Instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobData_GetStorageStreamPtr) (LibMCData_BuildJobData pBuildJobData, LibMCData_StorageStream * pStreamInstance);
+
+/**
+* returns the data type of the job data.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[out] pDataType - Data type of the job data
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobData_GetDataTypePtr) (LibMCData_BuildJobData pBuildJobData, LibMCData::eBuildJobDataType * pDataType);
+
+/**
+* returns the mime type of a storage stream.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[in] nMimeTypeBufferSize - size of the buffer (including trailing 0)
+* @param[out] pMimeTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pMimeTypeBuffer -  buffer of Mime Type String, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobData_GetMIMETypePtr) (LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nMimeTypeBufferSize, LibMCData_uint32* pMimeTypeNeededChars, char * pMimeTypeBuffer);
+
+/*************************************************************************************************************************
+ Class definition for BuildJobDataIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the build job data the iterator points at.
+*
+* @param[in] pBuildJobDataIterator - BuildJobDataIterator instance.
+* @param[out] pCurrentInstance - returns the build job instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobDataIterator_GetCurrentJobDataPtr) (LibMCData_BuildJobDataIterator pBuildJobDataIterator, LibMCData_BuildJobData * pCurrentInstance);
+
 /*************************************************************************************************************************
  Class definition for BuildJob
 **************************************************************************************************************************/
@@ -323,6 +399,15 @@ typedef LibMCDataResult (*PLibMCDataBuildJob_GetNamePtr) (LibMCData_BuildJob pBu
 */
 typedef LibMCDataResult (*PLibMCDataBuildJob_GetStatusPtr) (LibMCData_BuildJob pBuildJob, LibMCData::eBuildJobStatus * pStatus);
 
+/**
+* returns the layer count of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pLayerCount - Layer Count of build job
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_GetLayerCountPtr) (LibMCData_BuildJob pBuildJob, LibMCData_uint32 * pLayerCount);
+
 /**
 * returns the timestamp when the job was created.
 *
@@ -343,6 +428,17 @@ typedef LibMCDataResult (*PLibMCDataBuildJob_GetTimeStampPtr) (LibMCData_BuildJo
 */
 typedef LibMCDataResult (*PLibMCDataBuildJob_GetStorageStreamPtr) (LibMCData_BuildJob pBuildJob, LibMCData_StorageStream * pStreamInstance);
 
+/**
+* returns the storage stream uuid of the build.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] nStreamUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pStreamUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pStreamUUIDBuffer -  buffer of Stream UUID., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_GetStorageStreamUUIDPtr) (LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nStreamUUIDBufferSize, LibMCData_uint32* pStreamUUIDNeededChars, char * pStreamUUIDBuffer);
+
 /**
 * creates a build job log session access class.
 *
@@ -352,6 +448,87 @@ typedef LibMCDataResult (*PLibMCDataBuildJob_GetStorageStreamPtr) (LibMCData_Bui
 */
 typedef LibMCDataResult (*PLibMCDataBuildJob_GetBuildJobLoggerPtr) (LibMCData_BuildJob pBuildJob, LibMCData_LogSession * pLogSession);
 
+/**
+* Starts validation of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_StartValidatingPtr) (LibMCData_BuildJob pBuildJob);
+
+/**
+* Finishes validation of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] nLayerCount - Layer count
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_FinishValidatingPtr) (LibMCData_BuildJob pBuildJob, LibMCData_uint32 nLayerCount);
+
+/**
+* Archives a Job. Job MUST not be opened in the system. Job MUST be of state validated.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_ArchiveJobPtr) (LibMCData_BuildJob pBuildJob);
+
+/**
+* Unarchives a Job. Job MUST be of state archived.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_UnArchiveJobPtr) (LibMCData_BuildJob pBuildJob);
+
+/**
+* Deletes a Job permanently including all referencing data objects. Job MUST be of state archived to succeed.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_DeleteJobPtr) (LibMCData_BuildJob pBuildJob);
+
+/**
+* Returns if a job is opened.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pCanBeArchived - returns if the job can be archived.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_JobCanBeArchivedPtr) (LibMCData_BuildJob pBuildJob, bool * pCanBeArchived);
+
+/**
+* Adds additional data to the Job. Job MUST be of state validated in order to add job data.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] pName - Name of the job
+* @param[in] pStream - Storage Stream Instance
+* @param[in] eDataType - Datatype of Job data
+* @param[in] pUserID - Currently authenticated user
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_AddJobDataPtr) (LibMCData_BuildJob pBuildJob, const char * pName, LibMCData_StorageStream pStream, LibMCData::eBuildJobDataType eDataType, const char * pUserID);
+
+/**
+* Retrieves a list of build job data objects, filtered by type.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] eDataType - Datatype of Job data.
+* @param[out] pIteratorInstance - Build Job Data Iterator Instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_ListJobDataByTypePtr) (LibMCData_BuildJob pBuildJob, LibMCData::eBuildJobDataType eDataType, LibMCData_BuildJobDataIterator * pIteratorInstance);
+
+/**
+* Retrieves a list of build job data objects.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pIteratorInstance - Build Job Data Iterator Instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_ListJobDataPtr) (LibMCData_BuildJob pBuildJob, LibMCData_BuildJobDataIterator * pIteratorInstance);
+
 /*************************************************************************************************************************
  Class definition for BuildJobIterator
 **************************************************************************************************************************/
@@ -376,11 +553,11 @@ typedef LibMCDataResult (*PLibMCDataBuildJobIterator_GetCurrentJobPtr) (LibMCDat
 * @param[in] pJobUUID - UUID String for the build job. Must be unique and newly generated.
 * @param[in] pName - Name String
 * @param[in] pUserID - Currently authenticated user
-* @param[in] pStreamInstance - Storage stream to create the job from. ContextUUID of Stream MUST be the Job UUID.
+* @param[in] pStorageStreamUUID - Storage stream uuid for the job. Needs not exist yet.
 * @param[out] pJobInstance - Build Job Instance.
 * @return error code or 0 (success)
 */
-typedef LibMCDataResult (*PLibMCDataBuildJobHandler_CreateJobPtr) (LibMCData_BuildJobHandler pBuildJobHandler, const char * pJobUUID, const char * pName, const char * pUserID, LibMCData_StorageStream pStreamInstance, LibMCData_BuildJob * pJobInstance);
+typedef LibMCDataResult (*PLibMCDataBuildJobHandler_CreateJobPtr) (LibMCData_BuildJobHandler pBuildJobHandler, const char * pJobUUID, const char * pName, const char * pUserID, const char * pStorageStreamUUID, LibMCData_BuildJob * pJobInstance);
 
 /**
 * Retrieves a job with a specific UUID.
@@ -546,7 +723,6 @@ typedef struct {
 	PLibMCDataIterator_CountPtr m_Iterator_Count;
 	PLibMCDataLogSession_AddEntryPtr m_LogSession_AddEntry;
 	PLibMCDataStorageStream_GetUUIDPtr m_StorageStream_GetUUID;
-	PLibMCDataStorageStream_GetContextUUIDPtr m_StorageStream_GetContextUUID;
 	PLibMCDataStorageStream_GetTimeStampPtr m_StorageStream_GetTimeStamp;
 	PLibMCDataStorageStream_GetNamePtr m_StorageStream_GetName;
 	PLibMCDataStorageStream_GetMIMETypePtr m_StorageStream_GetMIMEType;
@@ -560,12 +736,31 @@ typedef struct {
 	PLibMCDataStorage_BeginPartialStreamPtr m_Storage_BeginPartialStream;
 	PLibMCDataStorage_StorePartialStreamPtr m_Storage_StorePartialStream;
 	PLibMCDataStorage_FinishPartialStreamPtr m_Storage_FinishPartialStream;
+	PLibMCDataStorage_GetMaxStreamSizePtr m_Storage_GetMaxStreamSize;
+	PLibMCDataStorage_ContentTypeIsAcceptedPtr m_Storage_ContentTypeIsAccepted;
+	PLibMCDataBuildJobData_GetNamePtr m_BuildJobData_GetName;
+	PLibMCDataBuildJobData_GetTimeStampPtr m_BuildJobData_GetTimeStamp;
+	PLibMCDataBuildJobData_GetStorageStreamPtr m_BuildJobData_GetStorageStream;
+	PLibMCDataBuildJobData_GetDataTypePtr m_BuildJobData_GetDataType;
+	PLibMCDataBuildJobData_GetMIMETypePtr m_BuildJobData_GetMIMEType;
+	PLibMCDataBuildJobDataIterator_GetCurrentJobDataPtr m_BuildJobDataIterator_GetCurrentJobData;
 	PLibMCDataBuildJob_GetUUIDPtr m_BuildJob_GetUUID;
 	PLibMCDataBuildJob_GetNamePtr m_BuildJob_GetName;
 	PLibMCDataBuildJob_GetStatusPtr m_BuildJob_GetStatus;
+	PLibMCDataBuildJob_GetLayerCountPtr m_BuildJob_GetLayerCount;
 	PLibMCDataBuildJob_GetTimeStampPtr m_BuildJob_GetTimeStamp;
 	PLibMCDataBuildJob_GetStorageStreamPtr m_BuildJob_GetStorageStream;
+	PLibMCDataBuildJob_GetStorageStreamUUIDPtr m_BuildJob_GetStorageStreamUUID;
 	PLibMCDataBuildJob_GetBuildJobLoggerPtr m_BuildJob_GetBuildJobLogger;
+	PLibMCDataBuildJob_StartValidatingPtr m_BuildJob_StartValidating;
+	PLibMCDataBuildJob_FinishValidatingPtr m_BuildJob_FinishValidating;
+	PLibMCDataBuildJob_ArchiveJobPtr m_BuildJob_ArchiveJob;
+	PLibMCDataBuildJob_UnArchiveJobPtr m_BuildJob_UnArchiveJob;
+	PLibMCDataBuildJob_DeleteJobPtr m_BuildJob_DeleteJob;
+	PLibMCDataBuildJob_JobCanBeArchivedPtr m_BuildJob_JobCanBeArchived;
+	PLibMCDataBuildJob_AddJobDataPtr m_BuildJob_AddJobData;
+	PLibMCDataBuildJob_ListJobDataByTypePtr m_BuildJob_ListJobDataByType;
+	PLibMCDataBuildJob_ListJobDataPtr m_BuildJob_ListJobData;
 	PLibMCDataBuildJobIterator_GetCurrentJobPtr m_BuildJobIterator_GetCurrentJob;
 	PLibMCDataBuildJobHandler_CreateJobPtr m_BuildJobHandler_CreateJob;
 	PLibMCDataBuildJobHandler_RetrieveJobPtr m_BuildJobHandler_RetrieveJob;
diff --git a/Framework/HeadersCore/CppDynamic/libmcdata_dynamic.hpp b/Framework/HeadersCore/CppDynamic/libmcdata_dynamic.hpp
index 0889b7f7..7bb2924b 100644
--- a/Framework/HeadersCore/CppDynamic/libmcdata_dynamic.hpp
+++ b/Framework/HeadersCore/CppDynamic/libmcdata_dynamic.hpp
@@ -64,6 +64,8 @@ class CIterator;
 class CLogSession;
 class CStorageStream;
 class CStorage;
+class CBuildJobData;
+class CBuildJobDataIterator;
 class CBuildJob;
 class CBuildJobIterator;
 class CBuildJobHandler;
@@ -78,6 +80,8 @@ typedef CIterator CLibMCDataIterator;
 typedef CLogSession CLibMCDataLogSession;
 typedef CStorageStream CLibMCDataStorageStream;
 typedef CStorage CLibMCDataStorage;
+typedef CBuildJobData CLibMCDataBuildJobData;
+typedef CBuildJobDataIterator CLibMCDataBuildJobDataIterator;
 typedef CBuildJob CLibMCDataBuildJob;
 typedef CBuildJobIterator CLibMCDataBuildJobIterator;
 typedef CBuildJobHandler CLibMCDataBuildJobHandler;
@@ -92,6 +96,8 @@ typedef std::shared_ptr<CIterator> PIterator;
 typedef std::shared_ptr<CLogSession> PLogSession;
 typedef std::shared_ptr<CStorageStream> PStorageStream;
 typedef std::shared_ptr<CStorage> PStorage;
+typedef std::shared_ptr<CBuildJobData> PBuildJobData;
+typedef std::shared_ptr<CBuildJobDataIterator> PBuildJobDataIterator;
 typedef std::shared_ptr<CBuildJob> PBuildJob;
 typedef std::shared_ptr<CBuildJobIterator> PBuildJobIterator;
 typedef std::shared_ptr<CBuildJobHandler> PBuildJobHandler;
@@ -106,6 +112,8 @@ typedef PIterator PLibMCDataIterator;
 typedef PLogSession PLibMCDataLogSession;
 typedef PStorageStream PLibMCDataStorageStream;
 typedef PStorage PLibMCDataStorage;
+typedef PBuildJobData PLibMCDataBuildJobData;
+typedef PBuildJobDataIterator PLibMCDataBuildJobDataIterator;
 typedef PBuildJob PLibMCDataBuildJob;
 typedef PBuildJobIterator PLibMCDataBuildJobIterator;
 typedef PBuildJobHandler PLibMCDataBuildJobHandler;
@@ -287,6 +295,8 @@ class CWrapper {
 	friend class CLogSession;
 	friend class CStorageStream;
 	friend class CStorage;
+	friend class CBuildJobData;
+	friend class CBuildJobDataIterator;
 	friend class CBuildJob;
 	friend class CBuildJobIterator;
 	friend class CBuildJobHandler;
@@ -404,7 +414,6 @@ class CStorageStream : public CBase {
 	}
 	
 	inline std::string GetUUID();
-	inline std::string GetContextUUID();
 	inline std::string GetTimeStamp();
 	inline std::string GetName();
 	inline std::string GetMIMEType();
@@ -434,6 +443,46 @@ class CStorage : public CBase {
 	inline void BeginPartialStream(const std::string & sUUID, const std::string & sContextUUID, const std::string & sName, const std::string & sMimeType, const LibMCData_uint64 nSize, const std::string & sSHA2, const std::string & sUserID);
 	inline void StorePartialStream(const std::string & sUUID, const LibMCData_uint64 nOffset, const CInputVector<LibMCData_uint8> & ContentBuffer);
 	inline void FinishPartialStream(const std::string & sUUID);
+	inline LibMCData_uint64 GetMaxStreamSize();
+	inline bool ContentTypeIsAccepted(const std::string & sContentType);
+};
+	
+/*************************************************************************************************************************
+ Class CBuildJobData 
+**************************************************************************************************************************/
+class CBuildJobData : public CBase {
+public:
+	
+	/**
+	* CBuildJobData::CBuildJobData - Constructor for BuildJobData class.
+	*/
+	CBuildJobData(CWrapper* pWrapper, LibMCDataHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline std::string GetName();
+	inline std::string GetTimeStamp();
+	inline PStorageStream GetStorageStream();
+	inline eBuildJobDataType GetDataType();
+	inline std::string GetMIMEType();
+};
+	
+/*************************************************************************************************************************
+ Class CBuildJobDataIterator 
+**************************************************************************************************************************/
+class CBuildJobDataIterator : public CIterator {
+public:
+	
+	/**
+	* CBuildJobDataIterator::CBuildJobDataIterator - Constructor for BuildJobDataIterator class.
+	*/
+	CBuildJobDataIterator(CWrapper* pWrapper, LibMCDataHandle pHandle)
+		: CIterator(pWrapper, pHandle)
+	{
+	}
+	
+	inline PBuildJobData GetCurrentJobData();
 };
 	
 /*************************************************************************************************************************
@@ -453,9 +502,20 @@ class CBuildJob : public CBase {
 	inline std::string GetUUID();
 	inline std::string GetName();
 	inline eBuildJobStatus GetStatus();
+	inline LibMCData_uint32 GetLayerCount();
 	inline std::string GetTimeStamp();
 	inline PStorageStream GetStorageStream();
+	inline std::string GetStorageStreamUUID();
 	inline PLogSession GetBuildJobLogger();
+	inline void StartValidating();
+	inline void FinishValidating(const LibMCData_uint32 nLayerCount);
+	inline void ArchiveJob();
+	inline void UnArchiveJob();
+	inline void DeleteJob();
+	inline bool JobCanBeArchived();
+	inline void AddJobData(const std::string & sName, classParam<CStorageStream> pStream, const eBuildJobDataType eDataType, const std::string & sUserID);
+	inline PBuildJobDataIterator ListJobDataByType(const eBuildJobDataType eDataType);
+	inline PBuildJobDataIterator ListJobData();
 };
 	
 /*************************************************************************************************************************
@@ -489,7 +549,7 @@ class CBuildJobHandler : public CBase {
 	{
 	}
 	
-	inline PBuildJob CreateJob(const std::string & sJobUUID, const std::string & sName, const std::string & sUserID, classParam<CStorageStream> pStreamInstance);
+	inline PBuildJob CreateJob(const std::string & sJobUUID, const std::string & sName, const std::string & sUserID, const std::string & sStorageStreamUUID);
 	inline PBuildJob RetrieveJob(const std::string & sJobUUID);
 	inline PBuildJobIterator ListJobsByStatus(const eBuildJobStatus eStatus);
 	inline std::string ConvertBuildStatusToString(const eBuildJobStatus eStatus);
@@ -620,7 +680,6 @@ class CDataModel : public CBase {
 		pWrapperTable->m_Iterator_Count = nullptr;
 		pWrapperTable->m_LogSession_AddEntry = nullptr;
 		pWrapperTable->m_StorageStream_GetUUID = nullptr;
-		pWrapperTable->m_StorageStream_GetContextUUID = nullptr;
 		pWrapperTable->m_StorageStream_GetTimeStamp = nullptr;
 		pWrapperTable->m_StorageStream_GetName = nullptr;
 		pWrapperTable->m_StorageStream_GetMIMEType = nullptr;
@@ -634,12 +693,31 @@ class CDataModel : public CBase {
 		pWrapperTable->m_Storage_BeginPartialStream = nullptr;
 		pWrapperTable->m_Storage_StorePartialStream = nullptr;
 		pWrapperTable->m_Storage_FinishPartialStream = nullptr;
+		pWrapperTable->m_Storage_GetMaxStreamSize = nullptr;
+		pWrapperTable->m_Storage_ContentTypeIsAccepted = nullptr;
+		pWrapperTable->m_BuildJobData_GetName = nullptr;
+		pWrapperTable->m_BuildJobData_GetTimeStamp = nullptr;
+		pWrapperTable->m_BuildJobData_GetStorageStream = nullptr;
+		pWrapperTable->m_BuildJobData_GetDataType = nullptr;
+		pWrapperTable->m_BuildJobData_GetMIMEType = nullptr;
+		pWrapperTable->m_BuildJobDataIterator_GetCurrentJobData = nullptr;
 		pWrapperTable->m_BuildJob_GetUUID = nullptr;
 		pWrapperTable->m_BuildJob_GetName = nullptr;
 		pWrapperTable->m_BuildJob_GetStatus = nullptr;
+		pWrapperTable->m_BuildJob_GetLayerCount = nullptr;
 		pWrapperTable->m_BuildJob_GetTimeStamp = nullptr;
 		pWrapperTable->m_BuildJob_GetStorageStream = nullptr;
+		pWrapperTable->m_BuildJob_GetStorageStreamUUID = nullptr;
 		pWrapperTable->m_BuildJob_GetBuildJobLogger = nullptr;
+		pWrapperTable->m_BuildJob_StartValidating = nullptr;
+		pWrapperTable->m_BuildJob_FinishValidating = nullptr;
+		pWrapperTable->m_BuildJob_ArchiveJob = nullptr;
+		pWrapperTable->m_BuildJob_UnArchiveJob = nullptr;
+		pWrapperTable->m_BuildJob_DeleteJob = nullptr;
+		pWrapperTable->m_BuildJob_JobCanBeArchived = nullptr;
+		pWrapperTable->m_BuildJob_AddJobData = nullptr;
+		pWrapperTable->m_BuildJob_ListJobDataByType = nullptr;
+		pWrapperTable->m_BuildJob_ListJobData = nullptr;
 		pWrapperTable->m_BuildJobIterator_GetCurrentJob = nullptr;
 		pWrapperTable->m_BuildJobHandler_CreateJob = nullptr;
 		pWrapperTable->m_BuildJobHandler_RetrieveJob = nullptr;
@@ -768,15 +846,6 @@ class CDataModel : public CBase {
 		if (pWrapperTable->m_StorageStream_GetUUID == nullptr)
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
-		#ifdef _WIN32
-		pWrapperTable->m_StorageStream_GetContextUUID = (PLibMCDataStorageStream_GetContextUUIDPtr) GetProcAddress(hLibrary, "libmcdata_storagestream_getcontextuuid");
-		#else // _WIN32
-		pWrapperTable->m_StorageStream_GetContextUUID = (PLibMCDataStorageStream_GetContextUUIDPtr) dlsym(hLibrary, "libmcdata_storagestream_getcontextuuid");
-		dlerror();
-		#endif // _WIN32
-		if (pWrapperTable->m_StorageStream_GetContextUUID == nullptr)
-			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
-		
 		#ifdef _WIN32
 		pWrapperTable->m_StorageStream_GetTimeStamp = (PLibMCDataStorageStream_GetTimeStampPtr) GetProcAddress(hLibrary, "libmcdata_storagestream_gettimestamp");
 		#else // _WIN32
@@ -894,6 +963,78 @@ class CDataModel : public CBase {
 		if (pWrapperTable->m_Storage_FinishPartialStream == nullptr)
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_Storage_GetMaxStreamSize = (PLibMCDataStorage_GetMaxStreamSizePtr) GetProcAddress(hLibrary, "libmcdata_storage_getmaxstreamsize");
+		#else // _WIN32
+		pWrapperTable->m_Storage_GetMaxStreamSize = (PLibMCDataStorage_GetMaxStreamSizePtr) dlsym(hLibrary, "libmcdata_storage_getmaxstreamsize");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Storage_GetMaxStreamSize == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Storage_ContentTypeIsAccepted = (PLibMCDataStorage_ContentTypeIsAcceptedPtr) GetProcAddress(hLibrary, "libmcdata_storage_contenttypeisaccepted");
+		#else // _WIN32
+		pWrapperTable->m_Storage_ContentTypeIsAccepted = (PLibMCDataStorage_ContentTypeIsAcceptedPtr) dlsym(hLibrary, "libmcdata_storage_contenttypeisaccepted");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Storage_ContentTypeIsAccepted == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJobData_GetName = (PLibMCDataBuildJobData_GetNamePtr) GetProcAddress(hLibrary, "libmcdata_buildjobdata_getname");
+		#else // _WIN32
+		pWrapperTable->m_BuildJobData_GetName = (PLibMCDataBuildJobData_GetNamePtr) dlsym(hLibrary, "libmcdata_buildjobdata_getname");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJobData_GetName == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJobData_GetTimeStamp = (PLibMCDataBuildJobData_GetTimeStampPtr) GetProcAddress(hLibrary, "libmcdata_buildjobdata_gettimestamp");
+		#else // _WIN32
+		pWrapperTable->m_BuildJobData_GetTimeStamp = (PLibMCDataBuildJobData_GetTimeStampPtr) dlsym(hLibrary, "libmcdata_buildjobdata_gettimestamp");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJobData_GetTimeStamp == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJobData_GetStorageStream = (PLibMCDataBuildJobData_GetStorageStreamPtr) GetProcAddress(hLibrary, "libmcdata_buildjobdata_getstoragestream");
+		#else // _WIN32
+		pWrapperTable->m_BuildJobData_GetStorageStream = (PLibMCDataBuildJobData_GetStorageStreamPtr) dlsym(hLibrary, "libmcdata_buildjobdata_getstoragestream");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJobData_GetStorageStream == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJobData_GetDataType = (PLibMCDataBuildJobData_GetDataTypePtr) GetProcAddress(hLibrary, "libmcdata_buildjobdata_getdatatype");
+		#else // _WIN32
+		pWrapperTable->m_BuildJobData_GetDataType = (PLibMCDataBuildJobData_GetDataTypePtr) dlsym(hLibrary, "libmcdata_buildjobdata_getdatatype");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJobData_GetDataType == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJobData_GetMIMEType = (PLibMCDataBuildJobData_GetMIMETypePtr) GetProcAddress(hLibrary, "libmcdata_buildjobdata_getmimetype");
+		#else // _WIN32
+		pWrapperTable->m_BuildJobData_GetMIMEType = (PLibMCDataBuildJobData_GetMIMETypePtr) dlsym(hLibrary, "libmcdata_buildjobdata_getmimetype");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJobData_GetMIMEType == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJobDataIterator_GetCurrentJobData = (PLibMCDataBuildJobDataIterator_GetCurrentJobDataPtr) GetProcAddress(hLibrary, "libmcdata_buildjobdataiterator_getcurrentjobdata");
+		#else // _WIN32
+		pWrapperTable->m_BuildJobDataIterator_GetCurrentJobData = (PLibMCDataBuildJobDataIterator_GetCurrentJobDataPtr) dlsym(hLibrary, "libmcdata_buildjobdataiterator_getcurrentjobdata");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJobDataIterator_GetCurrentJobData == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_BuildJob_GetUUID = (PLibMCDataBuildJob_GetUUIDPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_getuuid");
 		#else // _WIN32
@@ -921,6 +1062,15 @@ class CDataModel : public CBase {
 		if (pWrapperTable->m_BuildJob_GetStatus == nullptr)
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJob_GetLayerCount = (PLibMCDataBuildJob_GetLayerCountPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_getlayercount");
+		#else // _WIN32
+		pWrapperTable->m_BuildJob_GetLayerCount = (PLibMCDataBuildJob_GetLayerCountPtr) dlsym(hLibrary, "libmcdata_buildjob_getlayercount");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJob_GetLayerCount == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_BuildJob_GetTimeStamp = (PLibMCDataBuildJob_GetTimeStampPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_gettimestamp");
 		#else // _WIN32
@@ -939,6 +1089,15 @@ class CDataModel : public CBase {
 		if (pWrapperTable->m_BuildJob_GetStorageStream == nullptr)
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJob_GetStorageStreamUUID = (PLibMCDataBuildJob_GetStorageStreamUUIDPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_getstoragestreamuuid");
+		#else // _WIN32
+		pWrapperTable->m_BuildJob_GetStorageStreamUUID = (PLibMCDataBuildJob_GetStorageStreamUUIDPtr) dlsym(hLibrary, "libmcdata_buildjob_getstoragestreamuuid");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJob_GetStorageStreamUUID == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_BuildJob_GetBuildJobLogger = (PLibMCDataBuildJob_GetBuildJobLoggerPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_getbuildjoblogger");
 		#else // _WIN32
@@ -948,6 +1107,87 @@ class CDataModel : public CBase {
 		if (pWrapperTable->m_BuildJob_GetBuildJobLogger == nullptr)
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJob_StartValidating = (PLibMCDataBuildJob_StartValidatingPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_startvalidating");
+		#else // _WIN32
+		pWrapperTable->m_BuildJob_StartValidating = (PLibMCDataBuildJob_StartValidatingPtr) dlsym(hLibrary, "libmcdata_buildjob_startvalidating");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJob_StartValidating == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJob_FinishValidating = (PLibMCDataBuildJob_FinishValidatingPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_finishvalidating");
+		#else // _WIN32
+		pWrapperTable->m_BuildJob_FinishValidating = (PLibMCDataBuildJob_FinishValidatingPtr) dlsym(hLibrary, "libmcdata_buildjob_finishvalidating");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJob_FinishValidating == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJob_ArchiveJob = (PLibMCDataBuildJob_ArchiveJobPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_archivejob");
+		#else // _WIN32
+		pWrapperTable->m_BuildJob_ArchiveJob = (PLibMCDataBuildJob_ArchiveJobPtr) dlsym(hLibrary, "libmcdata_buildjob_archivejob");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJob_ArchiveJob == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJob_UnArchiveJob = (PLibMCDataBuildJob_UnArchiveJobPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_unarchivejob");
+		#else // _WIN32
+		pWrapperTable->m_BuildJob_UnArchiveJob = (PLibMCDataBuildJob_UnArchiveJobPtr) dlsym(hLibrary, "libmcdata_buildjob_unarchivejob");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJob_UnArchiveJob == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJob_DeleteJob = (PLibMCDataBuildJob_DeleteJobPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_deletejob");
+		#else // _WIN32
+		pWrapperTable->m_BuildJob_DeleteJob = (PLibMCDataBuildJob_DeleteJobPtr) dlsym(hLibrary, "libmcdata_buildjob_deletejob");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJob_DeleteJob == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJob_JobCanBeArchived = (PLibMCDataBuildJob_JobCanBeArchivedPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_jobcanbearchived");
+		#else // _WIN32
+		pWrapperTable->m_BuildJob_JobCanBeArchived = (PLibMCDataBuildJob_JobCanBeArchivedPtr) dlsym(hLibrary, "libmcdata_buildjob_jobcanbearchived");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJob_JobCanBeArchived == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJob_AddJobData = (PLibMCDataBuildJob_AddJobDataPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_addjobdata");
+		#else // _WIN32
+		pWrapperTable->m_BuildJob_AddJobData = (PLibMCDataBuildJob_AddJobDataPtr) dlsym(hLibrary, "libmcdata_buildjob_addjobdata");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJob_AddJobData == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJob_ListJobDataByType = (PLibMCDataBuildJob_ListJobDataByTypePtr) GetProcAddress(hLibrary, "libmcdata_buildjob_listjobdatabytype");
+		#else // _WIN32
+		pWrapperTable->m_BuildJob_ListJobDataByType = (PLibMCDataBuildJob_ListJobDataByTypePtr) dlsym(hLibrary, "libmcdata_buildjob_listjobdatabytype");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJob_ListJobDataByType == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_BuildJob_ListJobData = (PLibMCDataBuildJob_ListJobDataPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_listjobdata");
+		#else // _WIN32
+		pWrapperTable->m_BuildJob_ListJobData = (PLibMCDataBuildJob_ListJobDataPtr) dlsym(hLibrary, "libmcdata_buildjob_listjobdata");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_BuildJob_ListJobData == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_BuildJobIterator_GetCurrentJob = (PLibMCDataBuildJobIterator_GetCurrentJobPtr) GetProcAddress(hLibrary, "libmcdata_buildjobiterator_getcurrentjob");
 		#else // _WIN32
@@ -1145,10 +1385,6 @@ class CDataModel : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_StorageStream_GetUUID == nullptr) )
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
-		eLookupError = (*pLookup)("libmcdata_storagestream_getcontextuuid", (void**)&(pWrapperTable->m_StorageStream_GetContextUUID));
-		if ( (eLookupError != 0) || (pWrapperTable->m_StorageStream_GetContextUUID == nullptr) )
-			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
-		
 		eLookupError = (*pLookup)("libmcdata_storagestream_gettimestamp", (void**)&(pWrapperTable->m_StorageStream_GetTimeStamp));
 		if ( (eLookupError != 0) || (pWrapperTable->m_StorageStream_GetTimeStamp == nullptr) )
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1201,6 +1437,38 @@ class CDataModel : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_Storage_FinishPartialStream == nullptr) )
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcdata_storage_getmaxstreamsize", (void**)&(pWrapperTable->m_Storage_GetMaxStreamSize));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Storage_GetMaxStreamSize == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_storage_contenttypeisaccepted", (void**)&(pWrapperTable->m_Storage_ContentTypeIsAccepted));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Storage_ContentTypeIsAccepted == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_buildjobdata_getname", (void**)&(pWrapperTable->m_BuildJobData_GetName));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJobData_GetName == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_buildjobdata_gettimestamp", (void**)&(pWrapperTable->m_BuildJobData_GetTimeStamp));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJobData_GetTimeStamp == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_buildjobdata_getstoragestream", (void**)&(pWrapperTable->m_BuildJobData_GetStorageStream));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJobData_GetStorageStream == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_buildjobdata_getdatatype", (void**)&(pWrapperTable->m_BuildJobData_GetDataType));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJobData_GetDataType == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_buildjobdata_getmimetype", (void**)&(pWrapperTable->m_BuildJobData_GetMIMEType));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJobData_GetMIMEType == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_buildjobdataiterator_getcurrentjobdata", (void**)&(pWrapperTable->m_BuildJobDataIterator_GetCurrentJobData));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJobDataIterator_GetCurrentJobData == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcdata_buildjob_getuuid", (void**)&(pWrapperTable->m_BuildJob_GetUUID));
 		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_GetUUID == nullptr) )
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1213,6 +1481,10 @@ class CDataModel : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_GetStatus == nullptr) )
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcdata_buildjob_getlayercount", (void**)&(pWrapperTable->m_BuildJob_GetLayerCount));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_GetLayerCount == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcdata_buildjob_gettimestamp", (void**)&(pWrapperTable->m_BuildJob_GetTimeStamp));
 		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_GetTimeStamp == nullptr) )
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1221,10 +1493,50 @@ class CDataModel : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_GetStorageStream == nullptr) )
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcdata_buildjob_getstoragestreamuuid", (void**)&(pWrapperTable->m_BuildJob_GetStorageStreamUUID));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_GetStorageStreamUUID == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcdata_buildjob_getbuildjoblogger", (void**)&(pWrapperTable->m_BuildJob_GetBuildJobLogger));
 		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_GetBuildJobLogger == nullptr) )
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcdata_buildjob_startvalidating", (void**)&(pWrapperTable->m_BuildJob_StartValidating));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_StartValidating == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_buildjob_finishvalidating", (void**)&(pWrapperTable->m_BuildJob_FinishValidating));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_FinishValidating == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_buildjob_archivejob", (void**)&(pWrapperTable->m_BuildJob_ArchiveJob));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_ArchiveJob == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_buildjob_unarchivejob", (void**)&(pWrapperTable->m_BuildJob_UnArchiveJob));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_UnArchiveJob == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_buildjob_deletejob", (void**)&(pWrapperTable->m_BuildJob_DeleteJob));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_DeleteJob == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_buildjob_jobcanbearchived", (void**)&(pWrapperTable->m_BuildJob_JobCanBeArchived));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_JobCanBeArchived == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_buildjob_addjobdata", (void**)&(pWrapperTable->m_BuildJob_AddJobData));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_AddJobData == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_buildjob_listjobdatabytype", (void**)&(pWrapperTable->m_BuildJob_ListJobDataByType));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_ListJobDataByType == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdata_buildjob_listjobdata", (void**)&(pWrapperTable->m_BuildJob_ListJobData));
+		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJob_ListJobData == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcdata_buildjobiterator_getcurrentjob", (void**)&(pWrapperTable->m_BuildJobIterator_GetCurrentJob));
 		if ( (eLookupError != 0) || (pWrapperTable->m_BuildJobIterator_GetCurrentJob == nullptr) )
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1407,21 +1719,6 @@ class CDataModel : public CBase {
 		return std::string(&bufferUUID[0]);
 	}
 	
-	/**
-	* CStorageStream::GetContextUUID - returns the context uuid of a storage stream. Context might be for example a project uuid that this stream is part of.
-	* @return UUID String
-	*/
-	std::string CStorageStream::GetContextUUID()
-	{
-		LibMCData_uint32 bytesNeededContextUUID = 0;
-		LibMCData_uint32 bytesWrittenContextUUID = 0;
-		CheckError(m_pWrapper->m_WrapperTable.m_StorageStream_GetContextUUID(m_pHandle, 0, &bytesNeededContextUUID, nullptr));
-		std::vector<char> bufferContextUUID(bytesNeededContextUUID);
-		CheckError(m_pWrapper->m_WrapperTable.m_StorageStream_GetContextUUID(m_pHandle, bytesNeededContextUUID, &bytesWrittenContextUUID, &bufferContextUUID[0]));
-		
-		return std::string(&bufferContextUUID[0]);
-	}
-	
 	/**
 	* CStorageStream::GetTimeStamp - returns the timestamp of a storage stream.
 	* @return Timestamp in ISO8601 UTC format
@@ -1600,6 +1897,126 @@ class CDataModel : public CBase {
 		CheckError(m_pWrapper->m_WrapperTable.m_Storage_FinishPartialStream(m_pHandle, sUUID.c_str()));
 	}
 	
+	/**
+	* CStorage::GetMaxStreamSize - Returns the maximum stream size that the data model allows.
+	* @return Maximum Stream Size in Bytes.
+	*/
+	LibMCData_uint64 CStorage::GetMaxStreamSize()
+	{
+		LibMCData_uint64 resultMaxStreamSize = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Storage_GetMaxStreamSize(m_pHandle, &resultMaxStreamSize));
+		
+		return resultMaxStreamSize;
+	}
+	
+	/**
+	* CStorage::ContentTypeIsAccepted - Returns if the given content type is an acceptable value.
+	* @param[in] sContentType - Content type string (is taken case-insensitive)
+	* @return Content type is accepted.
+	*/
+	bool CStorage::ContentTypeIsAccepted(const std::string & sContentType)
+	{
+		bool resultAccepted = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Storage_ContentTypeIsAccepted(m_pHandle, sContentType.c_str(), &resultAccepted));
+		
+		return resultAccepted;
+	}
+	
+	/**
+	 * Method definitions for class CBuildJobData
+	 */
+	
+	/**
+	* CBuildJobData::GetName - returns the name of a build job.
+	* @return Name String
+	*/
+	std::string CBuildJobData::GetName()
+	{
+		LibMCData_uint32 bytesNeededName = 0;
+		LibMCData_uint32 bytesWrittenName = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJobData_GetName(m_pHandle, 0, &bytesNeededName, nullptr));
+		std::vector<char> bufferName(bytesNeededName);
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJobData_GetName(m_pHandle, bytesNeededName, &bytesWrittenName, &bufferName[0]));
+		
+		return std::string(&bufferName[0]);
+	}
+	
+	/**
+	* CBuildJobData::GetTimeStamp - returns the timestamp when the job was created.
+	* @return Timestamp in ISO8601 UTC format
+	*/
+	std::string CBuildJobData::GetTimeStamp()
+	{
+		LibMCData_uint32 bytesNeededTimestamp = 0;
+		LibMCData_uint32 bytesWrittenTimestamp = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJobData_GetTimeStamp(m_pHandle, 0, &bytesNeededTimestamp, nullptr));
+		std::vector<char> bufferTimestamp(bytesNeededTimestamp);
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJobData_GetTimeStamp(m_pHandle, bytesNeededTimestamp, &bytesWrittenTimestamp, &bufferTimestamp[0]));
+		
+		return std::string(&bufferTimestamp[0]);
+	}
+	
+	/**
+	* CBuildJobData::GetStorageStream - returns the storage stream of the build.
+	* @return Stream Instance.
+	*/
+	PStorageStream CBuildJobData::GetStorageStream()
+	{
+		LibMCDataHandle hStreamInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJobData_GetStorageStream(m_pHandle, &hStreamInstance));
+		
+		if (!hStreamInstance) {
+			CheckError(LIBMCDATA_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CStorageStream>(m_pWrapper, hStreamInstance);
+	}
+	
+	/**
+	* CBuildJobData::GetDataType - returns the data type of the job data.
+	* @return Data type of the job data
+	*/
+	eBuildJobDataType CBuildJobData::GetDataType()
+	{
+		eBuildJobDataType resultDataType = (eBuildJobDataType) 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJobData_GetDataType(m_pHandle, &resultDataType));
+		
+		return resultDataType;
+	}
+	
+	/**
+	* CBuildJobData::GetMIMEType - returns the mime type of a storage stream.
+	* @return Mime Type String
+	*/
+	std::string CBuildJobData::GetMIMEType()
+	{
+		LibMCData_uint32 bytesNeededMimeType = 0;
+		LibMCData_uint32 bytesWrittenMimeType = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJobData_GetMIMEType(m_pHandle, 0, &bytesNeededMimeType, nullptr));
+		std::vector<char> bufferMimeType(bytesNeededMimeType);
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJobData_GetMIMEType(m_pHandle, bytesNeededMimeType, &bytesWrittenMimeType, &bufferMimeType[0]));
+		
+		return std::string(&bufferMimeType[0]);
+	}
+	
+	/**
+	 * Method definitions for class CBuildJobDataIterator
+	 */
+	
+	/**
+	* CBuildJobDataIterator::GetCurrentJobData - Returns the build job data the iterator points at.
+	* @return returns the build job instance.
+	*/
+	PBuildJobData CBuildJobDataIterator::GetCurrentJobData()
+	{
+		LibMCDataHandle hCurrentInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJobDataIterator_GetCurrentJobData(m_pHandle, &hCurrentInstance));
+		
+		if (!hCurrentInstance) {
+			CheckError(LIBMCDATA_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CBuildJobData>(m_pWrapper, hCurrentInstance);
+	}
+	
 	/**
 	 * Method definitions for class CBuildJob
 	 */
@@ -1646,6 +2063,18 @@ class CDataModel : public CBase {
 		return resultStatus;
 	}
 	
+	/**
+	* CBuildJob::GetLayerCount - returns the layer count of a build job.
+	* @return Layer Count of build job
+	*/
+	LibMCData_uint32 CBuildJob::GetLayerCount()
+	{
+		LibMCData_uint32 resultLayerCount = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJob_GetLayerCount(m_pHandle, &resultLayerCount));
+		
+		return resultLayerCount;
+	}
+	
 	/**
 	* CBuildJob::GetTimeStamp - returns the timestamp when the job was created.
 	* @return Timestamp in ISO8601 UTC format
@@ -1676,6 +2105,21 @@ class CDataModel : public CBase {
 		return std::make_shared<CStorageStream>(m_pWrapper, hStreamInstance);
 	}
 	
+	/**
+	* CBuildJob::GetStorageStreamUUID - returns the storage stream uuid of the build.
+	* @return Stream UUID.
+	*/
+	std::string CBuildJob::GetStorageStreamUUID()
+	{
+		LibMCData_uint32 bytesNeededStreamUUID = 0;
+		LibMCData_uint32 bytesWrittenStreamUUID = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJob_GetStorageStreamUUID(m_pHandle, 0, &bytesNeededStreamUUID, nullptr));
+		std::vector<char> bufferStreamUUID(bytesNeededStreamUUID);
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJob_GetStorageStreamUUID(m_pHandle, bytesNeededStreamUUID, &bytesWrittenStreamUUID, &bufferStreamUUID[0]));
+		
+		return std::string(&bufferStreamUUID[0]);
+	}
+	
 	/**
 	* CBuildJob::GetBuildJobLogger - creates a build job log session access class.
 	* @return LogSession class instance.
@@ -1691,6 +2135,103 @@ class CDataModel : public CBase {
 		return std::make_shared<CLogSession>(m_pWrapper, hLogSession);
 	}
 	
+	/**
+	* CBuildJob::StartValidating - Starts validation of a build job.
+	*/
+	void CBuildJob::StartValidating()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJob_StartValidating(m_pHandle));
+	}
+	
+	/**
+	* CBuildJob::FinishValidating - Finishes validation of a build job.
+	* @param[in] nLayerCount - Layer count
+	*/
+	void CBuildJob::FinishValidating(const LibMCData_uint32 nLayerCount)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJob_FinishValidating(m_pHandle, nLayerCount));
+	}
+	
+	/**
+	* CBuildJob::ArchiveJob - Archives a Job. Job MUST not be opened in the system. Job MUST be of state validated.
+	*/
+	void CBuildJob::ArchiveJob()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJob_ArchiveJob(m_pHandle));
+	}
+	
+	/**
+	* CBuildJob::UnArchiveJob - Unarchives a Job. Job MUST be of state archived.
+	*/
+	void CBuildJob::UnArchiveJob()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJob_UnArchiveJob(m_pHandle));
+	}
+	
+	/**
+	* CBuildJob::DeleteJob - Deletes a Job permanently including all referencing data objects. Job MUST be of state archived to succeed.
+	*/
+	void CBuildJob::DeleteJob()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJob_DeleteJob(m_pHandle));
+	}
+	
+	/**
+	* CBuildJob::JobCanBeArchived - Returns if a job is opened.
+	* @return returns if the job can be archived.
+	*/
+	bool CBuildJob::JobCanBeArchived()
+	{
+		bool resultCanBeArchived = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJob_JobCanBeArchived(m_pHandle, &resultCanBeArchived));
+		
+		return resultCanBeArchived;
+	}
+	
+	/**
+	* CBuildJob::AddJobData - Adds additional data to the Job. Job MUST be of state validated in order to add job data.
+	* @param[in] sName - Name of the job
+	* @param[in] pStream - Storage Stream Instance
+	* @param[in] eDataType - Datatype of Job data
+	* @param[in] sUserID - Currently authenticated user
+	*/
+	void CBuildJob::AddJobData(const std::string & sName, classParam<CStorageStream> pStream, const eBuildJobDataType eDataType, const std::string & sUserID)
+	{
+		LibMCDataHandle hStream = pStream.GetHandle();
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJob_AddJobData(m_pHandle, sName.c_str(), hStream, eDataType, sUserID.c_str()));
+	}
+	
+	/**
+	* CBuildJob::ListJobDataByType - Retrieves a list of build job data objects, filtered by type.
+	* @param[in] eDataType - Datatype of Job data.
+	* @return Build Job Data Iterator Instance.
+	*/
+	PBuildJobDataIterator CBuildJob::ListJobDataByType(const eBuildJobDataType eDataType)
+	{
+		LibMCDataHandle hIteratorInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJob_ListJobDataByType(m_pHandle, eDataType, &hIteratorInstance));
+		
+		if (!hIteratorInstance) {
+			CheckError(LIBMCDATA_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CBuildJobDataIterator>(m_pWrapper, hIteratorInstance);
+	}
+	
+	/**
+	* CBuildJob::ListJobData - Retrieves a list of build job data objects.
+	* @return Build Job Data Iterator Instance.
+	*/
+	PBuildJobDataIterator CBuildJob::ListJobData()
+	{
+		LibMCDataHandle hIteratorInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJob_ListJobData(m_pHandle, &hIteratorInstance));
+		
+		if (!hIteratorInstance) {
+			CheckError(LIBMCDATA_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CBuildJobDataIterator>(m_pWrapper, hIteratorInstance);
+	}
+	
 	/**
 	 * Method definitions for class CBuildJobIterator
 	 */
@@ -1719,14 +2260,13 @@ class CDataModel : public CBase {
 	* @param[in] sJobUUID - UUID String for the build job. Must be unique and newly generated.
 	* @param[in] sName - Name String
 	* @param[in] sUserID - Currently authenticated user
-	* @param[in] pStreamInstance - Storage stream to create the job from. ContextUUID of Stream MUST be the Job UUID.
+	* @param[in] sStorageStreamUUID - Storage stream uuid for the job. Needs not exist yet.
 	* @return Build Job Instance.
 	*/
-	PBuildJob CBuildJobHandler::CreateJob(const std::string & sJobUUID, const std::string & sName, const std::string & sUserID, classParam<CStorageStream> pStreamInstance)
+	PBuildJob CBuildJobHandler::CreateJob(const std::string & sJobUUID, const std::string & sName, const std::string & sUserID, const std::string & sStorageStreamUUID)
 	{
-		LibMCDataHandle hStreamInstance = pStreamInstance.GetHandle();
 		LibMCDataHandle hJobInstance = nullptr;
-		CheckError(m_pWrapper->m_WrapperTable.m_BuildJobHandler_CreateJob(m_pHandle, sJobUUID.c_str(), sName.c_str(), sUserID.c_str(), hStreamInstance, &hJobInstance));
+		CheckError(m_pWrapper->m_WrapperTable.m_BuildJobHandler_CreateJob(m_pHandle, sJobUUID.c_str(), sName.c_str(), sUserID.c_str(), sStorageStreamUUID.c_str(), &hJobInstance));
 		
 		if (!hJobInstance) {
 			CheckError(LIBMCDATA_ERROR_INVALIDPARAM);
diff --git a/Framework/HeadersCore/CppDynamic/libmcdata_types.hpp b/Framework/HeadersCore/CppDynamic/libmcdata_types.hpp
index e520360a..f9936b8a 100644
--- a/Framework/HeadersCore/CppDynamic/libmcdata_types.hpp
+++ b/Framework/HeadersCore/CppDynamic/libmcdata_types.hpp
@@ -266,6 +266,46 @@ typedef void * LibMCData_pvoid;
 #define LIBMCDATA_ERROR_DUPLICATESTORAGESTREAM 239
 #define LIBMCDATA_ERROR_INVALIDPARTIALUPLOAD 240
 #define LIBMCDATA_ERROR_PARTIALUPLOADNOTFINISHED 241
+#define LIBMCDATA_ERROR_APIREQUESTNOTHANDLED 242
+#define LIBMCDATA_ERROR_APIREQUESTALREADYHANDLED 243
+#define LIBMCDATA_ERROR_INVALIDAPIREQUESTTYPE 244
+#define LIBMCDATA_ERROR_INVALIDUPLOADSTREAM 245
+#define LIBMCDATA_ERROR_COULDNOTPARSEJSONREQUEST 246
+#define LIBMCDATA_ERROR_INVALIDCONTEXTUUID 247
+#define LIBMCDATA_ERROR_INVALIDUPLOADNAME 248
+#define LIBMCDATA_ERROR_INVALIDMIMETYPE 249
+#define LIBMCDATA_ERROR_INVALIDSTREAMSIZE 250
+#define LIBMCDATA_ERROR_INVALIDSHA256SUM 251
+#define LIBMCDATA_ERROR_INVALIDSTREAMUUID 252
+#define LIBMCDATA_ERROR_INVALIDFIELDNAME 253
+#define LIBMCDATA_ERROR_UPLOADSIZEMISMATCH 254
+#define LIBMCDATA_ERROR_CONTENTTYPENOTACCEPTED 255
+#define LIBMCDATA_ERROR_NOCURRENTUPLOAD 256
+#define LIBMCDATA_ERROR_UPLOADCHECKSUMMISMATCH 257
+#define LIBMCDATA_ERROR_INVALIDSTORAGESTREAMSTATUS 258
+#define LIBMCDATA_ERROR_CONTEXTUUIDNOTACCEPTED 259
+#define LIBMCDATA_ERROR_INVALIDBUILDUUID 260
+#define LIBMCDATA_ERROR_MISSINGTHREADCOUNT 261
+#define LIBMCDATA_ERROR_INVALIDTHREADCOUNT 262
+#define LIBMCDATA_ERROR_COULDNOTUPDATEBUILDSTATUS 263
+#define LIBMCDATA_ERROR_INVALIDITERATOR 264
+#define LIBMCDATA_ERROR_INVALIDDATATYPE 265
+#define LIBMCDATA_ERROR_COULDNOTSENDSIGNAL 266
+#define LIBMCDATA_ERROR_MISSINGSIGNALPARAMETER 267
+#define LIBMCDATA_ERROR_NOUSERINTERFACEDEFINITION 268
+#define LIBMCDATA_ERROR_MISSINGAPPNAME 269
+#define LIBMCDATA_ERROR_MISSINGCOPYRIGHT 270
+#define LIBMCDATA_ERROR_MISSINGMAINPAGE 271
+#define LIBMCDATA_ERROR_MISSINGMENUITEMID 272
+#define LIBMCDATA_ERROR_MISSINGMENUITEMICON 273
+#define LIBMCDATA_ERROR_MISSINGMENUITEMCAPTION 274
+#define LIBMCDATA_ERROR_MISSINGTARGETPAGE 275
+#define LIBMCDATA_ERROR_MISSINGMENUNODE 276
+#define LIBMCDATA_ERROR_MISSINGTOOLBARNODE 277
+#define LIBMCDATA_ERROR_MISSINGTOOLBARITEMID 278
+#define LIBMCDATA_ERROR_MISSINGTOOLBARITEMICON 279
+#define LIBMCDATA_ERROR_MISSINGTOOLBARITEMCAPTION 280
+#define LIBMCDATA_ERROR_MISSINGSERVICESNODE 281
 
 /*************************************************************************************************************************
  Error strings for LibMCData
@@ -444,6 +484,46 @@ inline const char * LIBMCDATA_GETERRORSTRING (LibMCDataResult nErrorCode) {
     case LIBMCDATA_ERROR_DUPLICATESTORAGESTREAM: return "Duplicate Storage Stream";
     case LIBMCDATA_ERROR_INVALIDPARTIALUPLOAD: return "Invalid Partial Upload";
     case LIBMCDATA_ERROR_PARTIALUPLOADNOTFINISHED: return "Partial Upload not finished";
+    case LIBMCDATA_ERROR_APIREQUESTNOTHANDLED: return "API Request not handled";
+    case LIBMCDATA_ERROR_APIREQUESTALREADYHANDLED: return "API Request already handled";
+    case LIBMCDATA_ERROR_INVALIDAPIREQUESTTYPE: return "Invalid API Request type";
+    case LIBMCDATA_ERROR_INVALIDUPLOADSTREAM: return "Invalid Upload Stream";
+    case LIBMCDATA_ERROR_COULDNOTPARSEJSONREQUEST: return "Could not parse JSON request";
+    case LIBMCDATA_ERROR_INVALIDCONTEXTUUID: return "Invalid Context UUID";
+    case LIBMCDATA_ERROR_INVALIDUPLOADNAME: return "Invalid Upload Name";
+    case LIBMCDATA_ERROR_INVALIDMIMETYPE: return "Invalid Mime Type";
+    case LIBMCDATA_ERROR_INVALIDSTREAMSIZE: return "Invalid Stream Size";
+    case LIBMCDATA_ERROR_INVALIDSHA256SUM: return "Invalid SHA256 Sum";
+    case LIBMCDATA_ERROR_INVALIDSTREAMUUID: return "Invalid Stream UUID";
+    case LIBMCDATA_ERROR_INVALIDFIELDNAME: return "Invalid field name";
+    case LIBMCDATA_ERROR_UPLOADSIZEMISMATCH: return "Upload size mismatch";
+    case LIBMCDATA_ERROR_CONTENTTYPENOTACCEPTED: return "Content type not accepted";
+    case LIBMCDATA_ERROR_NOCURRENTUPLOAD: return "No current upload";
+    case LIBMCDATA_ERROR_UPLOADCHECKSUMMISMATCH: return "Upload checksum mismatch";
+    case LIBMCDATA_ERROR_INVALIDSTORAGESTREAMSTATUS: return "Invalid storage stream status";
+    case LIBMCDATA_ERROR_CONTEXTUUIDNOTACCEPTED: return "Context uuid not accepted";
+    case LIBMCDATA_ERROR_INVALIDBUILDUUID: return "Invalid build uuid";
+    case LIBMCDATA_ERROR_MISSINGTHREADCOUNT: return "Missing thread count";
+    case LIBMCDATA_ERROR_INVALIDTHREADCOUNT: return "Invalid thread count";
+    case LIBMCDATA_ERROR_COULDNOTUPDATEBUILDSTATUS: return "Could not update build status";
+    case LIBMCDATA_ERROR_INVALIDITERATOR: return "Invalid iterator";
+    case LIBMCDATA_ERROR_INVALIDDATATYPE: return "Invalid data type";
+    case LIBMCDATA_ERROR_COULDNOTSENDSIGNAL: return "Could not send signal";
+    case LIBMCDATA_ERROR_MISSINGSIGNALPARAMETER: return "Missing signal parameter";
+    case LIBMCDATA_ERROR_NOUSERINTERFACEDEFINITION: return "No user interface definition";
+    case LIBMCDATA_ERROR_MISSINGAPPNAME: return "Missing app name";
+    case LIBMCDATA_ERROR_MISSINGCOPYRIGHT: return "Missing copyright";
+    case LIBMCDATA_ERROR_MISSINGMAINPAGE: return "Missing main page";
+    case LIBMCDATA_ERROR_MISSINGMENUITEMID: return "Missing menu item id";
+    case LIBMCDATA_ERROR_MISSINGMENUITEMICON: return "Missing menu item icon";
+    case LIBMCDATA_ERROR_MISSINGMENUITEMCAPTION: return "Missing menu item caption";
+    case LIBMCDATA_ERROR_MISSINGTARGETPAGE: return "Missing menu item target page";
+    case LIBMCDATA_ERROR_MISSINGMENUNODE: return "Missing menu node";
+    case LIBMCDATA_ERROR_MISSINGTOOLBARNODE: return "Missing toolbar node";
+    case LIBMCDATA_ERROR_MISSINGTOOLBARITEMID: return "Missing toolbar item id";
+    case LIBMCDATA_ERROR_MISSINGTOOLBARITEMICON: return "Missing toolbar item icon";
+    case LIBMCDATA_ERROR_MISSINGTOOLBARITEMCAPTION: return "Missing toolbar item caption";
+    case LIBMCDATA_ERROR_MISSINGSERVICESNODE: return "Missing services node";
     default: return "unknown error";
   }
 }
@@ -457,6 +537,8 @@ typedef LibMCDataHandle LibMCData_Iterator;
 typedef LibMCDataHandle LibMCData_LogSession;
 typedef LibMCDataHandle LibMCData_StorageStream;
 typedef LibMCDataHandle LibMCData_Storage;
+typedef LibMCDataHandle LibMCData_BuildJobData;
+typedef LibMCDataHandle LibMCData_BuildJobDataIterator;
 typedef LibMCDataHandle LibMCData_BuildJob;
 typedef LibMCDataHandle LibMCData_BuildJobIterator;
 typedef LibMCDataHandle LibMCData_BuildJobHandler;
@@ -487,7 +569,18 @@ namespace LibMCData {
     Created = 0,
     Validating = 100,
     Validated = 200,
-    Archived = 300
+    Archived = 300,
+    Deleted = 400
+  };
+  
+  enum class eBuildJobDataType : LibMCData_int32 {
+    Unknown = 0,
+    Toolpath = 1,
+    PNGImage = 2,
+    JPEGImage = 3,
+    Thumbnail = 4,
+    Timeline = 5,
+    CustomBinaryData = 100
   };
   
   /*************************************************************************************************************************
@@ -519,6 +612,7 @@ namespace LibMCData {
 typedef LibMCData::eLogLevel eLibMCDataLogLevel;
 typedef LibMCData::eDataBaseType eLibMCDataDataBaseType;
 typedef LibMCData::eBuildJobStatus eLibMCDataBuildJobStatus;
+typedef LibMCData::eBuildJobDataType eLibMCDataBuildJobDataType;
 typedef LibMCData::StreamReadCallback LibMCDataStreamReadCallback;
 typedef LibMCData::StreamSeekCallback LibMCDataStreamSeekCallback;
 
diff --git a/Framework/HeadersDev/CppDynamic/libmcdriverenv_abi.hpp b/Framework/HeadersDev/CppDynamic/libmcdriverenv_abi.hpp
index 0167b07f..e08dc06a 100644
--- a/Framework/HeadersDev/CppDynamic/libmcdriverenv_abi.hpp
+++ b/Framework/HeadersDev/CppDynamic/libmcdriverenv_abi.hpp
@@ -60,10 +60,144 @@ extern "C" {
  Class definition for Base
 **************************************************************************************************************************/
 
+/*************************************************************************************************************************
+ Class definition for WorkingFileExecution
+**************************************************************************************************************************/
+
+/**
+* Returns the execution status
+*
+* @param[in] pWorkingFileExecution - WorkingFileExecution instance.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingfileexecution_getstatus(LibMCDriverEnv_WorkingFileExecution pWorkingFileExecution);
+
+/**
+* Returns the output of the executable as string buffer
+*
+* @param[in] pWorkingFileExecution - WorkingFileExecution instance.
+* @param[in] nStringBufferBufferSize - size of the buffer (including trailing 0)
+* @param[out] pStringBufferNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pStringBufferBuffer -  buffer of stdout buffer, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingfileexecution_returnstdout(LibMCDriverEnv_WorkingFileExecution pWorkingFileExecution, const LibMCDriverEnv_uint32 nStringBufferBufferSize, LibMCDriverEnv_uint32* pStringBufferNeededChars, char * pStringBufferBuffer);
+
+/*************************************************************************************************************************
+ Class definition for WorkingFile
+**************************************************************************************************************************/
+
+/**
+* Retrieves absolute file name of the working file
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @param[in] nFileNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFileNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFileNameBuffer -  buffer of global path of the file, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingfile_getabsolutefilename(LibMCDriverEnv_WorkingFile pWorkingFile, const LibMCDriverEnv_uint32 nFileNameBufferSize, LibMCDriverEnv_uint32* pFileNameNeededChars, char * pFileNameBuffer);
+
+/**
+* Returns the size of temporary file.
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @param[out] pFileSize - file size
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingfile_getsize(LibMCDriverEnv_WorkingFile pWorkingFile, LibMCDriverEnv_uint64 * pFileSize);
+
+/**
+* Calculates the SHA256 checksum of the file.
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @param[in] nSHA2BufferSize - size of the buffer (including trailing 0)
+* @param[out] pSHA2NeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pSHA2Buffer -  buffer of sha256 checksum, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingfile_calculatesha2(LibMCDriverEnv_WorkingFile pWorkingFile, const LibMCDriverEnv_uint32 nSHA2BufferSize, LibMCDriverEnv_uint32* pSHA2NeededChars, char * pSHA2Buffer);
+
+/**
+* Deletes the temporary file.
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingfile_deletefile(LibMCDriverEnv_WorkingFile pWorkingFile);
+
+/**
+* Executes the temporary file, if it is an executable.
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @param[out] pExecution - execution object
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingfile_executefile(LibMCDriverEnv_WorkingFile pWorkingFile, LibMCDriverEnv_WorkingFileExecution * pExecution);
+
+/*************************************************************************************************************************
+ Class definition for WorkingDirectory
+**************************************************************************************************************************/
+
+/**
+* Retrieves absolute file path.
+*
+* @param[in] pWorkingDirectory - WorkingDirectory instance.
+* @param[in] nFilePathBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFilePathNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFilePathBuffer -  buffer of global path of the directory, including path delimiter., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingdirectory_getabsolutefilepath(LibMCDriverEnv_WorkingDirectory pWorkingDirectory, const LibMCDriverEnv_uint32 nFilePathBufferSize, LibMCDriverEnv_uint32* pFilePathNeededChars, char * pFilePathBuffer);
+
+/**
+* Stores a data buffer in a temporary file.
+*
+* @param[in] pWorkingDirectory - WorkingDirectory instance.
+* @param[in] pFileName - filename to store to. Can not include any path delimiters or ..
+* @param[in] nDataBufferBufferSize - Number of elements in buffer
+* @param[in] pDataBufferBuffer - uint8 buffer of file data to store to.
+* @param[out] pWorkingFile - working file instance.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingdirectory_storecustomdata(LibMCDriverEnv_WorkingDirectory pWorkingDirectory, const char * pFileName, LibMCDriverEnv_uint64 nDataBufferBufferSize, const LibMCDriverEnv_uint8 * pDataBufferBuffer, LibMCDriverEnv_WorkingFile * pWorkingFile);
+
+/**
+* Stores attached driver data in a temporary file.
+*
+* @param[in] pWorkingDirectory - WorkingDirectory instance.
+* @param[in] pFileName - filename to store to. Can not include any path delimiters or ..
+* @param[in] pIdentifier - identifier of the binary data in the driver package.
+* @param[out] pWorkingFile - working file instance.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingdirectory_storedriverdata(LibMCDriverEnv_WorkingDirectory pWorkingDirectory, const char * pFileName, const char * pIdentifier, LibMCDriverEnv_WorkingFile * pWorkingFile);
+
 /*************************************************************************************************************************
  Class definition for DriverEnvironment
 **************************************************************************************************************************/
 
+/**
+* creates a temporary working directory.
+*
+* @param[in] pDriverEnvironment - DriverEnvironment instance.
+* @param[out] pWorkingDirectory - creates a working directory
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_driverenvironment_createworkingdirectory(LibMCDriverEnv_DriverEnvironment pDriverEnvironment, LibMCDriverEnv_WorkingDirectory * pWorkingDirectory);
+
+/**
+* retrieves attached driver data into a memory buffer.
+*
+* @param[in] pDriverEnvironment - DriverEnvironment instance.
+* @param[in] pIdentifier - identifier of the binary data in the driver package.
+* @param[in] nDataBufferBufferSize - Number of elements in buffer
+* @param[out] pDataBufferNeededCount - will be filled with the count of the written elements, or needed buffer size.
+* @param[out] pDataBufferBuffer - uint8 buffer of buffer data.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_driverenvironment_retrievedriverdata(LibMCDriverEnv_DriverEnvironment pDriverEnvironment, const char * pIdentifier, const LibMCDriverEnv_uint64 nDataBufferBufferSize, LibMCDriverEnv_uint64* pDataBufferNeededCount, LibMCDriverEnv_uint8 * pDataBufferBuffer);
+
 /*************************************************************************************************************************
  Global functions
 **************************************************************************************************************************/
diff --git a/Framework/HeadersDev/CppDynamic/libmcdriverenv_dynamic.h b/Framework/HeadersDev/CppDynamic/libmcdriverenv_dynamic.h
index 892e0288..edb0a6b2 100644
--- a/Framework/HeadersDev/CppDynamic/libmcdriverenv_dynamic.h
+++ b/Framework/HeadersDev/CppDynamic/libmcdriverenv_dynamic.h
@@ -47,10 +47,144 @@ Interface version: 1.0.0
  Class definition for Base
 **************************************************************************************************************************/
 
+/*************************************************************************************************************************
+ Class definition for WorkingFileExecution
+**************************************************************************************************************************/
+
+/**
+* Returns the execution status
+*
+* @param[in] pWorkingFileExecution - WorkingFileExecution instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriverEnvResult (*PLibMCDriverEnvWorkingFileExecution_GetStatusPtr) (LibMCDriverEnv_WorkingFileExecution pWorkingFileExecution);
+
+/**
+* Returns the output of the executable as string buffer
+*
+* @param[in] pWorkingFileExecution - WorkingFileExecution instance.
+* @param[in] nStringBufferBufferSize - size of the buffer (including trailing 0)
+* @param[out] pStringBufferNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pStringBufferBuffer -  buffer of stdout buffer, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDriverEnvResult (*PLibMCDriverEnvWorkingFileExecution_ReturnStdOutPtr) (LibMCDriverEnv_WorkingFileExecution pWorkingFileExecution, const LibMCDriverEnv_uint32 nStringBufferBufferSize, LibMCDriverEnv_uint32* pStringBufferNeededChars, char * pStringBufferBuffer);
+
+/*************************************************************************************************************************
+ Class definition for WorkingFile
+**************************************************************************************************************************/
+
+/**
+* Retrieves absolute file name of the working file
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @param[in] nFileNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFileNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFileNameBuffer -  buffer of global path of the file, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDriverEnvResult (*PLibMCDriverEnvWorkingFile_GetAbsoluteFileNamePtr) (LibMCDriverEnv_WorkingFile pWorkingFile, const LibMCDriverEnv_uint32 nFileNameBufferSize, LibMCDriverEnv_uint32* pFileNameNeededChars, char * pFileNameBuffer);
+
+/**
+* Returns the size of temporary file.
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @param[out] pFileSize - file size
+* @return error code or 0 (success)
+*/
+typedef LibMCDriverEnvResult (*PLibMCDriverEnvWorkingFile_GetSizePtr) (LibMCDriverEnv_WorkingFile pWorkingFile, LibMCDriverEnv_uint64 * pFileSize);
+
+/**
+* Calculates the SHA256 checksum of the file.
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @param[in] nSHA2BufferSize - size of the buffer (including trailing 0)
+* @param[out] pSHA2NeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pSHA2Buffer -  buffer of sha256 checksum, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDriverEnvResult (*PLibMCDriverEnvWorkingFile_CalculateSHA2Ptr) (LibMCDriverEnv_WorkingFile pWorkingFile, const LibMCDriverEnv_uint32 nSHA2BufferSize, LibMCDriverEnv_uint32* pSHA2NeededChars, char * pSHA2Buffer);
+
+/**
+* Deletes the temporary file.
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriverEnvResult (*PLibMCDriverEnvWorkingFile_DeleteFilePtr) (LibMCDriverEnv_WorkingFile pWorkingFile);
+
+/**
+* Executes the temporary file, if it is an executable.
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @param[out] pExecution - execution object
+* @return error code or 0 (success)
+*/
+typedef LibMCDriverEnvResult (*PLibMCDriverEnvWorkingFile_ExecuteFilePtr) (LibMCDriverEnv_WorkingFile pWorkingFile, LibMCDriverEnv_WorkingFileExecution * pExecution);
+
+/*************************************************************************************************************************
+ Class definition for WorkingDirectory
+**************************************************************************************************************************/
+
+/**
+* Retrieves absolute file path.
+*
+* @param[in] pWorkingDirectory - WorkingDirectory instance.
+* @param[in] nFilePathBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFilePathNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFilePathBuffer -  buffer of global path of the directory, including path delimiter., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDriverEnvResult (*PLibMCDriverEnvWorkingDirectory_GetAbsoluteFilePathPtr) (LibMCDriverEnv_WorkingDirectory pWorkingDirectory, const LibMCDriverEnv_uint32 nFilePathBufferSize, LibMCDriverEnv_uint32* pFilePathNeededChars, char * pFilePathBuffer);
+
+/**
+* Stores a data buffer in a temporary file.
+*
+* @param[in] pWorkingDirectory - WorkingDirectory instance.
+* @param[in] pFileName - filename to store to. Can not include any path delimiters or ..
+* @param[in] nDataBufferBufferSize - Number of elements in buffer
+* @param[in] pDataBufferBuffer - uint8 buffer of file data to store to.
+* @param[out] pWorkingFile - working file instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriverEnvResult (*PLibMCDriverEnvWorkingDirectory_StoreCustomDataPtr) (LibMCDriverEnv_WorkingDirectory pWorkingDirectory, const char * pFileName, LibMCDriverEnv_uint64 nDataBufferBufferSize, const LibMCDriverEnv_uint8 * pDataBufferBuffer, LibMCDriverEnv_WorkingFile * pWorkingFile);
+
+/**
+* Stores attached driver data in a temporary file.
+*
+* @param[in] pWorkingDirectory - WorkingDirectory instance.
+* @param[in] pFileName - filename to store to. Can not include any path delimiters or ..
+* @param[in] pIdentifier - identifier of the binary data in the driver package.
+* @param[out] pWorkingFile - working file instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriverEnvResult (*PLibMCDriverEnvWorkingDirectory_StoreDriverDataPtr) (LibMCDriverEnv_WorkingDirectory pWorkingDirectory, const char * pFileName, const char * pIdentifier, LibMCDriverEnv_WorkingFile * pWorkingFile);
+
 /*************************************************************************************************************************
  Class definition for DriverEnvironment
 **************************************************************************************************************************/
 
+/**
+* creates a temporary working directory.
+*
+* @param[in] pDriverEnvironment - DriverEnvironment instance.
+* @param[out] pWorkingDirectory - creates a working directory
+* @return error code or 0 (success)
+*/
+typedef LibMCDriverEnvResult (*PLibMCDriverEnvDriverEnvironment_CreateWorkingDirectoryPtr) (LibMCDriverEnv_DriverEnvironment pDriverEnvironment, LibMCDriverEnv_WorkingDirectory * pWorkingDirectory);
+
+/**
+* retrieves attached driver data into a memory buffer.
+*
+* @param[in] pDriverEnvironment - DriverEnvironment instance.
+* @param[in] pIdentifier - identifier of the binary data in the driver package.
+* @param[in] nDataBufferBufferSize - Number of elements in buffer
+* @param[out] pDataBufferNeededCount - will be filled with the count of the written elements, or needed buffer size.
+* @param[out] pDataBufferBuffer - uint8 buffer of buffer data.
+* @return error code or 0 (success)
+*/
+typedef LibMCDriverEnvResult (*PLibMCDriverEnvDriverEnvironment_RetrieveDriverDataPtr) (LibMCDriverEnv_DriverEnvironment pDriverEnvironment, const char * pIdentifier, const LibMCDriverEnv_uint64 nDataBufferBufferSize, LibMCDriverEnv_uint64* pDataBufferNeededCount, LibMCDriverEnv_uint8 * pDataBufferBuffer);
+
 /*************************************************************************************************************************
  Global functions
 **************************************************************************************************************************/
@@ -107,6 +241,18 @@ typedef LibMCDriverEnvResult (*PLibMCDriverEnvGetSymbolLookupMethodPtr) (LibMCDr
 
 typedef struct {
 	void * m_LibraryHandle;
+	PLibMCDriverEnvWorkingFileExecution_GetStatusPtr m_WorkingFileExecution_GetStatus;
+	PLibMCDriverEnvWorkingFileExecution_ReturnStdOutPtr m_WorkingFileExecution_ReturnStdOut;
+	PLibMCDriverEnvWorkingFile_GetAbsoluteFileNamePtr m_WorkingFile_GetAbsoluteFileName;
+	PLibMCDriverEnvWorkingFile_GetSizePtr m_WorkingFile_GetSize;
+	PLibMCDriverEnvWorkingFile_CalculateSHA2Ptr m_WorkingFile_CalculateSHA2;
+	PLibMCDriverEnvWorkingFile_DeleteFilePtr m_WorkingFile_DeleteFile;
+	PLibMCDriverEnvWorkingFile_ExecuteFilePtr m_WorkingFile_ExecuteFile;
+	PLibMCDriverEnvWorkingDirectory_GetAbsoluteFilePathPtr m_WorkingDirectory_GetAbsoluteFilePath;
+	PLibMCDriverEnvWorkingDirectory_StoreCustomDataPtr m_WorkingDirectory_StoreCustomData;
+	PLibMCDriverEnvWorkingDirectory_StoreDriverDataPtr m_WorkingDirectory_StoreDriverData;
+	PLibMCDriverEnvDriverEnvironment_CreateWorkingDirectoryPtr m_DriverEnvironment_CreateWorkingDirectory;
+	PLibMCDriverEnvDriverEnvironment_RetrieveDriverDataPtr m_DriverEnvironment_RetrieveDriverData;
 	PLibMCDriverEnvGetVersionPtr m_GetVersion;
 	PLibMCDriverEnvGetLastErrorPtr m_GetLastError;
 	PLibMCDriverEnvReleaseInstancePtr m_ReleaseInstance;
diff --git a/Framework/HeadersDev/CppDynamic/libmcdriverenv_dynamic.hpp b/Framework/HeadersDev/CppDynamic/libmcdriverenv_dynamic.hpp
index c329e4c7..9765d97f 100644
--- a/Framework/HeadersDev/CppDynamic/libmcdriverenv_dynamic.hpp
+++ b/Framework/HeadersDev/CppDynamic/libmcdriverenv_dynamic.hpp
@@ -60,6 +60,9 @@ namespace LibMCDriverEnv {
 **************************************************************************************************************************/
 class CWrapper;
 class CBase;
+class CWorkingFileExecution;
+class CWorkingFile;
+class CWorkingDirectory;
 class CDriverEnvironment;
 
 /*************************************************************************************************************************
@@ -67,6 +70,9 @@ class CDriverEnvironment;
 **************************************************************************************************************************/
 typedef CWrapper CLibMCDriverEnvWrapper;
 typedef CBase CLibMCDriverEnvBase;
+typedef CWorkingFileExecution CLibMCDriverEnvWorkingFileExecution;
+typedef CWorkingFile CLibMCDriverEnvWorkingFile;
+typedef CWorkingDirectory CLibMCDriverEnvWorkingDirectory;
 typedef CDriverEnvironment CLibMCDriverEnvDriverEnvironment;
 
 /*************************************************************************************************************************
@@ -74,6 +80,9 @@ typedef CDriverEnvironment CLibMCDriverEnvDriverEnvironment;
 **************************************************************************************************************************/
 typedef std::shared_ptr<CWrapper> PWrapper;
 typedef std::shared_ptr<CBase> PBase;
+typedef std::shared_ptr<CWorkingFileExecution> PWorkingFileExecution;
+typedef std::shared_ptr<CWorkingFile> PWorkingFile;
+typedef std::shared_ptr<CWorkingDirectory> PWorkingDirectory;
 typedef std::shared_ptr<CDriverEnvironment> PDriverEnvironment;
 
 /*************************************************************************************************************************
@@ -81,6 +90,9 @@ typedef std::shared_ptr<CDriverEnvironment> PDriverEnvironment;
 **************************************************************************************************************************/
 typedef PWrapper PLibMCDriverEnvWrapper;
 typedef PBase PLibMCDriverEnvBase;
+typedef PWorkingFileExecution PLibMCDriverEnvWorkingFileExecution;
+typedef PWorkingFile PLibMCDriverEnvWorkingFile;
+typedef PWorkingDirectory PLibMCDriverEnvWorkingDirectory;
 typedef PDriverEnvironment PLibMCDriverEnvDriverEnvironment;
 
 
@@ -254,6 +266,9 @@ class CWrapper {
 	LibMCDriverEnvResult loadWrapperTableFromSymbolLookupMethod(sLibMCDriverEnvDynamicWrapperTable * pWrapperTable, void* pSymbolLookupMethod);
 
 	friend class CBase;
+	friend class CWorkingFileExecution;
+	friend class CWorkingFile;
+	friend class CWorkingDirectory;
 	friend class CDriverEnvironment;
 
 };
@@ -315,6 +330,64 @@ class CBase {
 	friend class CWrapper;
 };
 	
+/*************************************************************************************************************************
+ Class CWorkingFileExecution 
+**************************************************************************************************************************/
+class CWorkingFileExecution : public CBase {
+public:
+	
+	/**
+	* CWorkingFileExecution::CWorkingFileExecution - Constructor for WorkingFileExecution class.
+	*/
+	CWorkingFileExecution(CWrapper* pWrapper, LibMCDriverEnvHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline void GetStatus();
+	inline std::string ReturnStdOut();
+};
+	
+/*************************************************************************************************************************
+ Class CWorkingFile 
+**************************************************************************************************************************/
+class CWorkingFile : public CBase {
+public:
+	
+	/**
+	* CWorkingFile::CWorkingFile - Constructor for WorkingFile class.
+	*/
+	CWorkingFile(CWrapper* pWrapper, LibMCDriverEnvHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline std::string GetAbsoluteFileName();
+	inline LibMCDriverEnv_uint64 GetSize();
+	inline std::string CalculateSHA2();
+	inline void DeleteFile();
+	inline PWorkingFileExecution ExecuteFile();
+};
+	
+/*************************************************************************************************************************
+ Class CWorkingDirectory 
+**************************************************************************************************************************/
+class CWorkingDirectory : public CBase {
+public:
+	
+	/**
+	* CWorkingDirectory::CWorkingDirectory - Constructor for WorkingDirectory class.
+	*/
+	CWorkingDirectory(CWrapper* pWrapper, LibMCDriverEnvHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline std::string GetAbsoluteFilePath();
+	inline PWorkingFile StoreCustomData(const std::string & sFileName, const CInputVector<LibMCDriverEnv_uint8> & DataBufferBuffer);
+	inline PWorkingFile StoreDriverData(const std::string & sFileName, const std::string & sIdentifier);
+};
+	
 /*************************************************************************************************************************
  Class CDriverEnvironment 
 **************************************************************************************************************************/
@@ -329,6 +402,8 @@ class CDriverEnvironment : public CBase {
 	{
 	}
 	
+	inline PWorkingDirectory CreateWorkingDirectory();
+	inline void RetrieveDriverData(const std::string & sIdentifier, std::vector<LibMCDriverEnv_uint8> & DataBufferBuffer);
 };
 	
 	/**
@@ -412,6 +487,18 @@ class CDriverEnvironment : public CBase {
 			return LIBMCDRIVERENV_ERROR_INVALIDPARAM;
 		
 		pWrapperTable->m_LibraryHandle = nullptr;
+		pWrapperTable->m_WorkingFileExecution_GetStatus = nullptr;
+		pWrapperTable->m_WorkingFileExecution_ReturnStdOut = nullptr;
+		pWrapperTable->m_WorkingFile_GetAbsoluteFileName = nullptr;
+		pWrapperTable->m_WorkingFile_GetSize = nullptr;
+		pWrapperTable->m_WorkingFile_CalculateSHA2 = nullptr;
+		pWrapperTable->m_WorkingFile_DeleteFile = nullptr;
+		pWrapperTable->m_WorkingFile_ExecuteFile = nullptr;
+		pWrapperTable->m_WorkingDirectory_GetAbsoluteFilePath = nullptr;
+		pWrapperTable->m_WorkingDirectory_StoreCustomData = nullptr;
+		pWrapperTable->m_WorkingDirectory_StoreDriverData = nullptr;
+		pWrapperTable->m_DriverEnvironment_CreateWorkingDirectory = nullptr;
+		pWrapperTable->m_DriverEnvironment_RetrieveDriverData = nullptr;
 		pWrapperTable->m_GetVersion = nullptr;
 		pWrapperTable->m_GetLastError = nullptr;
 		pWrapperTable->m_ReleaseInstance = nullptr;
@@ -465,6 +552,114 @@ class CDriverEnvironment : public CBase {
 		dlerror();
 		#endif // _WIN32
 		
+		#ifdef _WIN32
+		pWrapperTable->m_WorkingFileExecution_GetStatus = (PLibMCDriverEnvWorkingFileExecution_GetStatusPtr) GetProcAddress(hLibrary, "libmcdriverenv_workingfileexecution_getstatus");
+		#else // _WIN32
+		pWrapperTable->m_WorkingFileExecution_GetStatus = (PLibMCDriverEnvWorkingFileExecution_GetStatusPtr) dlsym(hLibrary, "libmcdriverenv_workingfileexecution_getstatus");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_WorkingFileExecution_GetStatus == nullptr)
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_WorkingFileExecution_ReturnStdOut = (PLibMCDriverEnvWorkingFileExecution_ReturnStdOutPtr) GetProcAddress(hLibrary, "libmcdriverenv_workingfileexecution_returnstdout");
+		#else // _WIN32
+		pWrapperTable->m_WorkingFileExecution_ReturnStdOut = (PLibMCDriverEnvWorkingFileExecution_ReturnStdOutPtr) dlsym(hLibrary, "libmcdriverenv_workingfileexecution_returnstdout");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_WorkingFileExecution_ReturnStdOut == nullptr)
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_WorkingFile_GetAbsoluteFileName = (PLibMCDriverEnvWorkingFile_GetAbsoluteFileNamePtr) GetProcAddress(hLibrary, "libmcdriverenv_workingfile_getabsolutefilename");
+		#else // _WIN32
+		pWrapperTable->m_WorkingFile_GetAbsoluteFileName = (PLibMCDriverEnvWorkingFile_GetAbsoluteFileNamePtr) dlsym(hLibrary, "libmcdriverenv_workingfile_getabsolutefilename");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_WorkingFile_GetAbsoluteFileName == nullptr)
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_WorkingFile_GetSize = (PLibMCDriverEnvWorkingFile_GetSizePtr) GetProcAddress(hLibrary, "libmcdriverenv_workingfile_getsize");
+		#else // _WIN32
+		pWrapperTable->m_WorkingFile_GetSize = (PLibMCDriverEnvWorkingFile_GetSizePtr) dlsym(hLibrary, "libmcdriverenv_workingfile_getsize");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_WorkingFile_GetSize == nullptr)
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_WorkingFile_CalculateSHA2 = (PLibMCDriverEnvWorkingFile_CalculateSHA2Ptr) GetProcAddress(hLibrary, "libmcdriverenv_workingfile_calculatesha2");
+		#else // _WIN32
+		pWrapperTable->m_WorkingFile_CalculateSHA2 = (PLibMCDriverEnvWorkingFile_CalculateSHA2Ptr) dlsym(hLibrary, "libmcdriverenv_workingfile_calculatesha2");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_WorkingFile_CalculateSHA2 == nullptr)
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_WorkingFile_DeleteFile = (PLibMCDriverEnvWorkingFile_DeleteFilePtr) GetProcAddress(hLibrary, "libmcdriverenv_workingfile_deletefile");
+		#else // _WIN32
+		pWrapperTable->m_WorkingFile_DeleteFile = (PLibMCDriverEnvWorkingFile_DeleteFilePtr) dlsym(hLibrary, "libmcdriverenv_workingfile_deletefile");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_WorkingFile_DeleteFile == nullptr)
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_WorkingFile_ExecuteFile = (PLibMCDriverEnvWorkingFile_ExecuteFilePtr) GetProcAddress(hLibrary, "libmcdriverenv_workingfile_executefile");
+		#else // _WIN32
+		pWrapperTable->m_WorkingFile_ExecuteFile = (PLibMCDriverEnvWorkingFile_ExecuteFilePtr) dlsym(hLibrary, "libmcdriverenv_workingfile_executefile");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_WorkingFile_ExecuteFile == nullptr)
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_WorkingDirectory_GetAbsoluteFilePath = (PLibMCDriverEnvWorkingDirectory_GetAbsoluteFilePathPtr) GetProcAddress(hLibrary, "libmcdriverenv_workingdirectory_getabsolutefilepath");
+		#else // _WIN32
+		pWrapperTable->m_WorkingDirectory_GetAbsoluteFilePath = (PLibMCDriverEnvWorkingDirectory_GetAbsoluteFilePathPtr) dlsym(hLibrary, "libmcdriverenv_workingdirectory_getabsolutefilepath");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_WorkingDirectory_GetAbsoluteFilePath == nullptr)
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_WorkingDirectory_StoreCustomData = (PLibMCDriverEnvWorkingDirectory_StoreCustomDataPtr) GetProcAddress(hLibrary, "libmcdriverenv_workingdirectory_storecustomdata");
+		#else // _WIN32
+		pWrapperTable->m_WorkingDirectory_StoreCustomData = (PLibMCDriverEnvWorkingDirectory_StoreCustomDataPtr) dlsym(hLibrary, "libmcdriverenv_workingdirectory_storecustomdata");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_WorkingDirectory_StoreCustomData == nullptr)
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_WorkingDirectory_StoreDriverData = (PLibMCDriverEnvWorkingDirectory_StoreDriverDataPtr) GetProcAddress(hLibrary, "libmcdriverenv_workingdirectory_storedriverdata");
+		#else // _WIN32
+		pWrapperTable->m_WorkingDirectory_StoreDriverData = (PLibMCDriverEnvWorkingDirectory_StoreDriverDataPtr) dlsym(hLibrary, "libmcdriverenv_workingdirectory_storedriverdata");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_WorkingDirectory_StoreDriverData == nullptr)
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_DriverEnvironment_CreateWorkingDirectory = (PLibMCDriverEnvDriverEnvironment_CreateWorkingDirectoryPtr) GetProcAddress(hLibrary, "libmcdriverenv_driverenvironment_createworkingdirectory");
+		#else // _WIN32
+		pWrapperTable->m_DriverEnvironment_CreateWorkingDirectory = (PLibMCDriverEnvDriverEnvironment_CreateWorkingDirectoryPtr) dlsym(hLibrary, "libmcdriverenv_driverenvironment_createworkingdirectory");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_DriverEnvironment_CreateWorkingDirectory == nullptr)
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_DriverEnvironment_RetrieveDriverData = (PLibMCDriverEnvDriverEnvironment_RetrieveDriverDataPtr) GetProcAddress(hLibrary, "libmcdriverenv_driverenvironment_retrievedriverdata");
+		#else // _WIN32
+		pWrapperTable->m_DriverEnvironment_RetrieveDriverData = (PLibMCDriverEnvDriverEnvironment_RetrieveDriverDataPtr) dlsym(hLibrary, "libmcdriverenv_driverenvironment_retrievedriverdata");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_DriverEnvironment_RetrieveDriverData == nullptr)
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_GetVersion = (PLibMCDriverEnvGetVersionPtr) GetProcAddress(hLibrary, "libmcdriverenv_getversion");
 		#else // _WIN32
@@ -526,6 +721,54 @@ class CDriverEnvironment : public CBase {
 		SymbolLookupType pLookup = (SymbolLookupType)pSymbolLookupMethod;
 		
 		LibMCDriverEnvResult eLookupError = LIBMCDRIVERENV_SUCCESS;
+		eLookupError = (*pLookup)("libmcdriverenv_workingfileexecution_getstatus", (void**)&(pWrapperTable->m_WorkingFileExecution_GetStatus));
+		if ( (eLookupError != 0) || (pWrapperTable->m_WorkingFileExecution_GetStatus == nullptr) )
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriverenv_workingfileexecution_returnstdout", (void**)&(pWrapperTable->m_WorkingFileExecution_ReturnStdOut));
+		if ( (eLookupError != 0) || (pWrapperTable->m_WorkingFileExecution_ReturnStdOut == nullptr) )
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriverenv_workingfile_getabsolutefilename", (void**)&(pWrapperTable->m_WorkingFile_GetAbsoluteFileName));
+		if ( (eLookupError != 0) || (pWrapperTable->m_WorkingFile_GetAbsoluteFileName == nullptr) )
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriverenv_workingfile_getsize", (void**)&(pWrapperTable->m_WorkingFile_GetSize));
+		if ( (eLookupError != 0) || (pWrapperTable->m_WorkingFile_GetSize == nullptr) )
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriverenv_workingfile_calculatesha2", (void**)&(pWrapperTable->m_WorkingFile_CalculateSHA2));
+		if ( (eLookupError != 0) || (pWrapperTable->m_WorkingFile_CalculateSHA2 == nullptr) )
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriverenv_workingfile_deletefile", (void**)&(pWrapperTable->m_WorkingFile_DeleteFile));
+		if ( (eLookupError != 0) || (pWrapperTable->m_WorkingFile_DeleteFile == nullptr) )
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriverenv_workingfile_executefile", (void**)&(pWrapperTable->m_WorkingFile_ExecuteFile));
+		if ( (eLookupError != 0) || (pWrapperTable->m_WorkingFile_ExecuteFile == nullptr) )
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriverenv_workingdirectory_getabsolutefilepath", (void**)&(pWrapperTable->m_WorkingDirectory_GetAbsoluteFilePath));
+		if ( (eLookupError != 0) || (pWrapperTable->m_WorkingDirectory_GetAbsoluteFilePath == nullptr) )
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriverenv_workingdirectory_storecustomdata", (void**)&(pWrapperTable->m_WorkingDirectory_StoreCustomData));
+		if ( (eLookupError != 0) || (pWrapperTable->m_WorkingDirectory_StoreCustomData == nullptr) )
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriverenv_workingdirectory_storedriverdata", (void**)&(pWrapperTable->m_WorkingDirectory_StoreDriverData));
+		if ( (eLookupError != 0) || (pWrapperTable->m_WorkingDirectory_StoreDriverData == nullptr) )
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriverenv_driverenvironment_createworkingdirectory", (void**)&(pWrapperTable->m_DriverEnvironment_CreateWorkingDirectory));
+		if ( (eLookupError != 0) || (pWrapperTable->m_DriverEnvironment_CreateWorkingDirectory == nullptr) )
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcdriverenv_driverenvironment_retrievedriverdata", (void**)&(pWrapperTable->m_DriverEnvironment_RetrieveDriverData));
+		if ( (eLookupError != 0) || (pWrapperTable->m_DriverEnvironment_RetrieveDriverData == nullptr) )
+			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcdriverenv_getversion", (void**)&(pWrapperTable->m_GetVersion));
 		if ( (eLookupError != 0) || (pWrapperTable->m_GetVersion == nullptr) )
 			return LIBMCDRIVERENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -555,9 +798,187 @@ class CDriverEnvironment : public CBase {
 	 * Method definitions for class CBase
 	 */
 	
+	/**
+	 * Method definitions for class CWorkingFileExecution
+	 */
+	
+	/**
+	* CWorkingFileExecution::GetStatus - Returns the execution status
+	*/
+	void CWorkingFileExecution::GetStatus()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_WorkingFileExecution_GetStatus(m_pHandle));
+	}
+	
+	/**
+	* CWorkingFileExecution::ReturnStdOut - Returns the output of the executable as string buffer
+	* @return stdout buffer
+	*/
+	std::string CWorkingFileExecution::ReturnStdOut()
+	{
+		LibMCDriverEnv_uint32 bytesNeededStringBuffer = 0;
+		LibMCDriverEnv_uint32 bytesWrittenStringBuffer = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_WorkingFileExecution_ReturnStdOut(m_pHandle, 0, &bytesNeededStringBuffer, nullptr));
+		std::vector<char> bufferStringBuffer(bytesNeededStringBuffer);
+		CheckError(m_pWrapper->m_WrapperTable.m_WorkingFileExecution_ReturnStdOut(m_pHandle, bytesNeededStringBuffer, &bytesWrittenStringBuffer, &bufferStringBuffer[0]));
+		
+		return std::string(&bufferStringBuffer[0]);
+	}
+	
+	/**
+	 * Method definitions for class CWorkingFile
+	 */
+	
+	/**
+	* CWorkingFile::GetAbsoluteFileName - Retrieves absolute file name of the working file
+	* @return global path of the file
+	*/
+	std::string CWorkingFile::GetAbsoluteFileName()
+	{
+		LibMCDriverEnv_uint32 bytesNeededFileName = 0;
+		LibMCDriverEnv_uint32 bytesWrittenFileName = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_WorkingFile_GetAbsoluteFileName(m_pHandle, 0, &bytesNeededFileName, nullptr));
+		std::vector<char> bufferFileName(bytesNeededFileName);
+		CheckError(m_pWrapper->m_WrapperTable.m_WorkingFile_GetAbsoluteFileName(m_pHandle, bytesNeededFileName, &bytesWrittenFileName, &bufferFileName[0]));
+		
+		return std::string(&bufferFileName[0]);
+	}
+	
+	/**
+	* CWorkingFile::GetSize - Returns the size of temporary file.
+	* @return file size
+	*/
+	LibMCDriverEnv_uint64 CWorkingFile::GetSize()
+	{
+		LibMCDriverEnv_uint64 resultFileSize = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_WorkingFile_GetSize(m_pHandle, &resultFileSize));
+		
+		return resultFileSize;
+	}
+	
+	/**
+	* CWorkingFile::CalculateSHA2 - Calculates the SHA256 checksum of the file.
+	* @return sha256 checksum
+	*/
+	std::string CWorkingFile::CalculateSHA2()
+	{
+		LibMCDriverEnv_uint32 bytesNeededSHA2 = 0;
+		LibMCDriverEnv_uint32 bytesWrittenSHA2 = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_WorkingFile_CalculateSHA2(m_pHandle, 0, &bytesNeededSHA2, nullptr));
+		std::vector<char> bufferSHA2(bytesNeededSHA2);
+		CheckError(m_pWrapper->m_WrapperTable.m_WorkingFile_CalculateSHA2(m_pHandle, bytesNeededSHA2, &bytesWrittenSHA2, &bufferSHA2[0]));
+		
+		return std::string(&bufferSHA2[0]);
+	}
+	
+	/**
+	* CWorkingFile::DeleteFile - Deletes the temporary file.
+	*/
+	void CWorkingFile::DeleteFile()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_WorkingFile_DeleteFile(m_pHandle));
+	}
+	
+	/**
+	* CWorkingFile::ExecuteFile - Executes the temporary file, if it is an executable.
+	* @return execution object
+	*/
+	PWorkingFileExecution CWorkingFile::ExecuteFile()
+	{
+		LibMCDriverEnvHandle hExecution = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_WorkingFile_ExecuteFile(m_pHandle, &hExecution));
+		
+		if (!hExecution) {
+			CheckError(LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CWorkingFileExecution>(m_pWrapper, hExecution);
+	}
+	
+	/**
+	 * Method definitions for class CWorkingDirectory
+	 */
+	
+	/**
+	* CWorkingDirectory::GetAbsoluteFilePath - Retrieves absolute file path.
+	* @return global path of the directory, including path delimiter.
+	*/
+	std::string CWorkingDirectory::GetAbsoluteFilePath()
+	{
+		LibMCDriverEnv_uint32 bytesNeededFilePath = 0;
+		LibMCDriverEnv_uint32 bytesWrittenFilePath = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_WorkingDirectory_GetAbsoluteFilePath(m_pHandle, 0, &bytesNeededFilePath, nullptr));
+		std::vector<char> bufferFilePath(bytesNeededFilePath);
+		CheckError(m_pWrapper->m_WrapperTable.m_WorkingDirectory_GetAbsoluteFilePath(m_pHandle, bytesNeededFilePath, &bytesWrittenFilePath, &bufferFilePath[0]));
+		
+		return std::string(&bufferFilePath[0]);
+	}
+	
+	/**
+	* CWorkingDirectory::StoreCustomData - Stores a data buffer in a temporary file.
+	* @param[in] sFileName - filename to store to. Can not include any path delimiters or ..
+	* @param[in] DataBufferBuffer - file data to store to.
+	* @return working file instance.
+	*/
+	PWorkingFile CWorkingDirectory::StoreCustomData(const std::string & sFileName, const CInputVector<LibMCDriverEnv_uint8> & DataBufferBuffer)
+	{
+		LibMCDriverEnvHandle hWorkingFile = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_WorkingDirectory_StoreCustomData(m_pHandle, sFileName.c_str(), (LibMCDriverEnv_uint64)DataBufferBuffer.size(), DataBufferBuffer.data(), &hWorkingFile));
+		
+		if (!hWorkingFile) {
+			CheckError(LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CWorkingFile>(m_pWrapper, hWorkingFile);
+	}
+	
+	/**
+	* CWorkingDirectory::StoreDriverData - Stores attached driver data in a temporary file.
+	* @param[in] sFileName - filename to store to. Can not include any path delimiters or ..
+	* @param[in] sIdentifier - identifier of the binary data in the driver package.
+	* @return working file instance.
+	*/
+	PWorkingFile CWorkingDirectory::StoreDriverData(const std::string & sFileName, const std::string & sIdentifier)
+	{
+		LibMCDriverEnvHandle hWorkingFile = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_WorkingDirectory_StoreDriverData(m_pHandle, sFileName.c_str(), sIdentifier.c_str(), &hWorkingFile));
+		
+		if (!hWorkingFile) {
+			CheckError(LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CWorkingFile>(m_pWrapper, hWorkingFile);
+	}
+	
 	/**
 	 * Method definitions for class CDriverEnvironment
 	 */
+	
+	/**
+	* CDriverEnvironment::CreateWorkingDirectory - creates a temporary working directory.
+	* @return creates a working directory
+	*/
+	PWorkingDirectory CDriverEnvironment::CreateWorkingDirectory()
+	{
+		LibMCDriverEnvHandle hWorkingDirectory = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_DriverEnvironment_CreateWorkingDirectory(m_pHandle, &hWorkingDirectory));
+		
+		if (!hWorkingDirectory) {
+			CheckError(LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CWorkingDirectory>(m_pWrapper, hWorkingDirectory);
+	}
+	
+	/**
+	* CDriverEnvironment::RetrieveDriverData - retrieves attached driver data into a memory buffer.
+	* @param[in] sIdentifier - identifier of the binary data in the driver package.
+	* @param[out] DataBufferBuffer - buffer data.
+	*/
+	void CDriverEnvironment::RetrieveDriverData(const std::string & sIdentifier, std::vector<LibMCDriverEnv_uint8> & DataBufferBuffer)
+	{
+		LibMCDriverEnv_uint64 elementsNeededDataBuffer = 0;
+		LibMCDriverEnv_uint64 elementsWrittenDataBuffer = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_DriverEnvironment_RetrieveDriverData(m_pHandle, sIdentifier.c_str(), 0, &elementsNeededDataBuffer, nullptr));
+		DataBufferBuffer.resize((size_t) elementsNeededDataBuffer);
+		CheckError(m_pWrapper->m_WrapperTable.m_DriverEnvironment_RetrieveDriverData(m_pHandle, sIdentifier.c_str(), elementsNeededDataBuffer, &elementsWrittenDataBuffer, DataBufferBuffer.data()));
+	}
 
 } // namespace LibMCDriverEnv
 
diff --git a/Framework/HeadersDev/CppDynamic/libmcdriverenv_types.hpp b/Framework/HeadersDev/CppDynamic/libmcdriverenv_types.hpp
index 69f4befb..6dcfd4b9 100644
--- a/Framework/HeadersDev/CppDynamic/libmcdriverenv_types.hpp
+++ b/Framework/HeadersDev/CppDynamic/libmcdriverenv_types.hpp
@@ -145,6 +145,9 @@ inline const char * LIBMCDRIVERENV_GETERRORSTRING (LibMCDriverEnvResult nErrorCo
 **************************************************************************************************************************/
 
 typedef LibMCDriverEnvHandle LibMCDriverEnv_Base;
+typedef LibMCDriverEnvHandle LibMCDriverEnv_WorkingFileExecution;
+typedef LibMCDriverEnvHandle LibMCDriverEnv_WorkingFile;
+typedef LibMCDriverEnvHandle LibMCDriverEnv_WorkingDirectory;
 typedef LibMCDriverEnvHandle LibMCDriverEnv_DriverEnvironment;
 
 namespace LibMCDriverEnv {
diff --git a/Framework/HeadersDev/CppDynamic/libmcenv_abi.hpp b/Framework/HeadersDev/CppDynamic/libmcenv_abi.hpp
index f154ca1c..3d7c671f 100644
--- a/Framework/HeadersDev/CppDynamic/libmcenv_abi.hpp
+++ b/Framework/HeadersDev/CppDynamic/libmcenv_abi.hpp
@@ -107,6 +107,28 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentinfo(LibMCEnv_
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentprofileuuid(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_uint32 nIndex, const LibMCEnv_uint32 nProfileUUIDBufferSize, LibMCEnv_uint32* pProfileUUIDNeededChars, char * pProfileUUIDBuffer);
 
+/**
+* Retrieves an assigned profile custom value.
+*
+* @param[in] pToolpathLayer - ToolpathLayer instance.
+* @param[in] pValueName - Value Name to query for.
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of String Value., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentprofilevalue(LibMCEnv_ToolpathLayer pToolpathLayer, const char * pValueName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
+/**
+* Retrieves an assigned profile value of a standard type.
+*
+* @param[in] pToolpathLayer - ToolpathLayer instance.
+* @param[in] eValueType - Enum to query for. MUST NOT be custom.
+* @param[out] pValue - Double Value
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentprofiletypedvalue(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv::eToolpathProfileValueType eValueType, LibMCEnv_double * pValue);
+
 /**
 * Retrieves the assigned segment part uuid.
 *
@@ -126,25 +148,43 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentpartuuid(LibMC
 * @param[in] nIndex - Index. Must be between 0 and Count - 1.
 * @param[in] nPointDataBufferSize - Number of elements in buffer
 * @param[out] pPointDataNeededCount - will be filled with the count of the written elements, or needed buffer size.
-* @param[out] pPointDataBuffer - Position2D buffer of The point data array
+* @param[out] pPointDataBuffer - Position2D buffer of The point data array. Positions are absolute in units.
 * @return error code or 0 (success)
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentpointdata(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_uint32 nIndex, const LibMCEnv_uint64 nPointDataBufferSize, LibMCEnv_uint64* pPointDataNeededCount, LibMCEnv::sPosition2D * pPointDataBuffer);
 
+/**
+* Retrieves the layers Z Value in units.
+*
+* @param[in] pToolpathLayer - ToolpathLayer instance.
+* @param[out] pZValue - Z Value of the layer in units.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getzvalue(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_int32 * pZValue);
+
+/**
+* Retrieves the toolpath units in mm.
+*
+* @param[in] pToolpathLayer - ToolpathLayer instance.
+* @param[out] pUnits - Toolpath units.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getunits(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_double * pUnits);
+
 /*************************************************************************************************************************
  Class definition for ToolpathAccessor
 **************************************************************************************************************************/
 
 /**
-* Returns Toolpath data UUID.
+* Returns Toolpath storage UUID.
 *
 * @param[in] pToolpathAccessor - ToolpathAccessor instance.
-* @param[in] nUUIDBufferSize - size of the buffer (including trailing 0)
-* @param[out] pUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
-* @param[out] pUUIDBuffer -  buffer of Returns toolpath data uuid., may be NULL
+* @param[in] nStorageUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pStorageUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pStorageUUIDBuffer -  buffer of Returns toolpath storage uuid., may be NULL
 * @return error code or 0 (success)
 */
-LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathaccessor_getuuid(LibMCEnv_ToolpathAccessor pToolpathAccessor, const LibMCEnv_uint32 nUUIDBufferSize, LibMCEnv_uint32* pUUIDNeededChars, char * pUUIDBuffer);
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathaccessor_getstorageuuid(LibMCEnv_ToolpathAccessor pToolpathAccessor, const LibMCEnv_uint32 nStorageUUIDBufferSize, LibMCEnv_uint32* pStorageUUIDNeededChars, char * pStorageUUIDBuffer);
 
 /**
 * Returns layer count.
@@ -165,6 +205,121 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathaccessor_getlayercount(LibMCEn
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathaccessor_loadlayer(LibMCEnv_ToolpathAccessor pToolpathAccessor, LibMCEnv_uint32 nLayerIndex, LibMCEnv_ToolpathLayer * pLayerData);
 
+/**
+* Retrieves the toolpath units in mm.
+*
+* @param[in] pToolpathAccessor - ToolpathAccessor instance.
+* @param[out] pUnits - Toolpath units.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathaccessor_getunits(LibMCEnv_ToolpathAccessor pToolpathAccessor, LibMCEnv_double * pUnits);
+
+/*************************************************************************************************************************
+ Class definition for Build
+**************************************************************************************************************************/
+
+/**
+* Returns name of the build.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name of the build., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_getname(LibMCEnv_Build pBuild, const LibMCEnv_uint32 nNameBufferSize, LibMCEnv_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* Returns uuid of the build.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] nBuildUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBuildUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBuildUUIDBuffer -  buffer of UUID of the build., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_getbuilduuid(LibMCEnv_Build pBuild, const LibMCEnv_uint32 nBuildUUIDBufferSize, LibMCEnv_uint32* pBuildUUIDNeededChars, char * pBuildUUIDBuffer);
+
+/**
+* Returns storage uuid of the build.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] nStorageUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pStorageUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pStorageUUIDBuffer -  buffer of Storage UUID of the build., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_getstorageuuid(LibMCEnv_Build pBuild, const LibMCEnv_uint32 nStorageUUIDBufferSize, LibMCEnv_uint32* pStorageUUIDNeededChars, char * pStorageUUIDBuffer);
+
+/**
+* Returns SHA256 of the build stream.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] nSHA256BufferSize - size of the buffer (including trailing 0)
+* @param[out] pSHA256NeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pSHA256Buffer -  buffer of SHA256 of the build stream., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_getstoragesha256(LibMCEnv_Build pBuild, const LibMCEnv_uint32 nSHA256BufferSize, LibMCEnv_uint32* pSHA256NeededChars, char * pSHA256Buffer);
+
+/**
+* Returns cached layer count of the toolpath.
+*
+* @param[in] pBuild - Build instance.
+* @param[out] pLayerCount - Returns layer count.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_getlayercount(LibMCEnv_Build pBuild, LibMCEnv_uint32 * pLayerCount);
+
+/**
+* loads the a toolpath into memory
+*
+* @param[in] pBuild - Build instance.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_loadtoolpath(LibMCEnv_Build pBuild);
+
+/**
+* unloads the a toolpath from memory, if it has been loaded before.
+*
+* @param[in] pBuild - Build instance.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_unloadtoolpath(LibMCEnv_Build pBuild);
+
+/**
+* checks, if a toolpath object is loaded to memory.
+*
+* @param[in] pBuild - Build instance.
+* @param[out] pIsLoaded - returns if toolpath is loaded.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_toolpathisloaded(LibMCEnv_Build pBuild, bool * pIsLoaded);
+
+/**
+* Creates an accessor object for a toolpath. Toolpath MUST have been loaded with LoadToolpath before.
+*
+* @param[in] pBuild - Build instance.
+* @param[out] pToolpathInstance - Toolpath instance.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_createtoolpathaccessor(LibMCEnv_Build pBuild, LibMCEnv_ToolpathAccessor * pToolpathInstance);
+
+/**
+* Adds binary data to store with the build.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] pName - Name of the attache data block.
+* @param[in] pMIMEType - Mime type of the data.
+* @param[in] nContentBufferSize - Number of elements in buffer
+* @param[in] pContentBuffer - uint8 buffer of Stream content to store
+* @param[in] nDataUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pDataUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pDataUUIDBuffer -  buffer of Data UUID of the attachment., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_addbinarydata(LibMCEnv_Build pBuild, const char * pName, const char * pMIMEType, LibMCEnv_uint64 nContentBufferSize, const LibMCEnv_uint8 * pContentBuffer, const LibMCEnv_uint32 nDataUUIDBufferSize, LibMCEnv_uint32* pDataUUIDNeededChars, char * pDataUUIDBuffer);
+
 /*************************************************************************************************************************
  Class definition for SignalTrigger
 **************************************************************************************************************************/
@@ -228,6 +383,16 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signaltrigger_getstatemachine(LibMCEnv
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signaltrigger_setstring(LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, const char * pValue);
 
+/**
+* sets a uuid value
+*
+* @param[in] pSignalTrigger - SignalTrigger instance.
+* @param[in] pName - Name
+* @param[in] pValue - Value
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signaltrigger_setuuid(LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, const char * pValue);
+
 /**
 * sets a double
 *
@@ -270,6 +435,18 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signaltrigger_setbool(LibMCEnv_SignalT
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signaltrigger_getstringresult(LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
 
+/**
+* returns a uuid value of the result
+*
+* @param[in] pSignalTrigger - SignalTrigger instance.
+* @param[in] pName - Name
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of Value, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signaltrigger_getuuidresult(LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
 /**
 * returns a string value of the result
 *
@@ -357,6 +534,18 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_getstatemachine(LibMCEnv
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_getstring(LibMCEnv_SignalHandler pSignalHandler, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
 
+/**
+* gets a uuid value
+*
+* @param[in] pSignalHandler - SignalHandler instance.
+* @param[in] pName - Name
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of Value, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_getuuid(LibMCEnv_SignalHandler pSignalHandler, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
 /**
 * gets a double
 *
@@ -397,6 +586,16 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_getbool(LibMCEnv_SignalH
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_setstringresult(LibMCEnv_SignalHandler pSignalHandler, const char * pName, const char * pValue);
 
+/**
+* returns a uuid value of the result
+*
+* @param[in] pSignalHandler - SignalHandler instance.
+* @param[in] pName - Name
+* @param[in] pValue - Value
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_setuuidresult(LibMCEnv_SignalHandler pSignalHandler, const char * pName, const char * pValue);
+
 /**
 * returns a string value of the result
 *
@@ -432,7 +631,7 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_setboolresult(LibMCEnv_S
 **************************************************************************************************************************/
 
 /**
-* creates a signal object to trigger.
+* prepares a signal object to trigger later.
 *
 * @param[in] pStateEnvironment - StateEnvironment instance.
 * @param[in] pMachineInstance - State machine instance name
@@ -440,7 +639,7 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_setboolresult(LibMCEnv_S
 * @param[out] pSignalInstance - Signal trigger object.
 * @return error code or 0 (success)
 */
-LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_createsignal(LibMCEnv_StateEnvironment pStateEnvironment, const char * pMachineInstance, const char * pSignalName, LibMCEnv_SignalTrigger * pSignalInstance);
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_preparesignal(LibMCEnv_StateEnvironment pStateEnvironment, const char * pMachineInstance, const char * pSignalName, LibMCEnv_SignalTrigger * pSignalInstance);
 
 /**
 * waits for a signal.
@@ -478,22 +677,14 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_getdriverlibrary(LibM
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_createdriveraccess(LibMCEnv_StateEnvironment pStateEnvironment, const char * pDriverName, LibMCEnv_pvoid * pDriverHandle);
 
 /**
-* Loads a toolpath from disk into memory.
+* Returns a instance of a build object.
 *
 * @param[in] pStateEnvironment - StateEnvironment instance.
-* @param[in] pToolpathUUID - UUID of the toolpath entity.
+* @param[in] pBuildUUID - UUID of the build entity.
+* @param[out] pBuildInstance - Build instance
 * @return error code or 0 (success)
 */
-LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_loadtoolpath(LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID);
-
-/**
-* unloads the a toolpath. It MUST have been loaded to memory before with LoadToolpath.
-*
-* @param[in] pStateEnvironment - StateEnvironment instance.
-* @param[in] pToolpathUUID - UUID of the toolpath entity.
-* @return error code or 0 (success)
-*/
-LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_unloadtoolpath(LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID);
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_getbuildjob(LibMCEnv_StateEnvironment pStateEnvironment, const char * pBuildUUID, LibMCEnv_Build * pBuildInstance);
 
 /**
 * unloads all toolpath in memory to clean up
@@ -503,26 +694,6 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_unloadtoolpath(LibMCE
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_unloadalltoolpathes(LibMCEnv_StateEnvironment pStateEnvironment);
 
-/**
-* creates an accessor object for a toolpath, if loaded to memory before.
-*
-* @param[in] pStateEnvironment - StateEnvironment instance.
-* @param[in] pToolpathUUID - UUID of the toolpath entity.
-* @param[out] pToolpathInstance - UUID of the toolpath entity.
-* @return error code or 0 (success)
-*/
-LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_createtoolpathaccessor(LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID, LibMCEnv_ToolpathAccessor * pToolpathInstance);
-
-/**
-* checks, if a toolpath object is loaded to memory.
-*
-* @param[in] pStateEnvironment - StateEnvironment instance.
-* @param[in] pToolpathUUID - UUID of the toolpath entity.
-* @param[out] pIsLoaded - returns if toolpath is loaded.
-* @return error code or 0 (success)
-*/
-LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_toolpathisloaded(LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID, bool * pIsLoaded);
-
 /**
 * sets the next state
 *
@@ -587,6 +758,16 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_checkfortermination(L
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_storestring(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const char * pValue);
 
+/**
+* stores a uuid in the current state machine
+*
+* @param[in] pStateEnvironment - StateEnvironment instance.
+* @param[in] pName - Name
+* @param[in] pValue - Value
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_storeuuid(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const char * pValue);
+
 /**
 * stores a string in the current state machine
 *
@@ -639,6 +820,18 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_storesignal(LibMCEnv_
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_retrievestring(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
 
+/**
+* retrieves a uuid from the current state machine. Fails if value has not been stored before.
+*
+* @param[in] pStateEnvironment - StateEnvironment instance.
+* @param[in] pName - Name
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of Value, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_retrieveuuid(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
 /**
 * retrieves a string from the current state machine. Fails if value has not been stored before.
 *
@@ -699,6 +892,17 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_clearstoredvalue(LibM
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_setstringparameter(LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, const char * pValue);
 
+/**
+* sets a uuid parameter
+*
+* @param[in] pStateEnvironment - StateEnvironment instance.
+* @param[in] pParameterGroup - Parameter Group
+* @param[in] pParameterName - Parameter Name
+* @param[in] pValue - Value to set
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_setuuidparameter(LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, const char * pValue);
+
 /**
 * sets a double parameter
 *
@@ -745,6 +949,19 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_setboolparameter(LibM
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_getstringparameter(LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
 
+/**
+* returns a uuid parameter
+*
+* @param[in] pStateEnvironment - StateEnvironment instance.
+* @param[in] pParameterGroup - Parameter Group
+* @param[in] pParameterName - Parameter Name
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of Value to set, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_getuuidparameter(LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
 /**
 * returns a double parameter
 *
diff --git a/Framework/HeadersDev/CppDynamic/libmcenv_dynamic.h b/Framework/HeadersDev/CppDynamic/libmcenv_dynamic.h
index c6416238..603d5286 100644
--- a/Framework/HeadersDev/CppDynamic/libmcenv_dynamic.h
+++ b/Framework/HeadersDev/CppDynamic/libmcenv_dynamic.h
@@ -94,6 +94,28 @@ typedef LibMCEnvResult (*PLibMCEnvToolpathLayer_GetSegmentInfoPtr) (LibMCEnv_Too
 */
 typedef LibMCEnvResult (*PLibMCEnvToolpathLayer_GetSegmentProfileUUIDPtr) (LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_uint32 nIndex, const LibMCEnv_uint32 nProfileUUIDBufferSize, LibMCEnv_uint32* pProfileUUIDNeededChars, char * pProfileUUIDBuffer);
 
+/**
+* Retrieves an assigned profile custom value.
+*
+* @param[in] pToolpathLayer - ToolpathLayer instance.
+* @param[in] pValueName - Value Name to query for.
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of String Value., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvToolpathLayer_GetSegmentProfileValuePtr) (LibMCEnv_ToolpathLayer pToolpathLayer, const char * pValueName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
+/**
+* Retrieves an assigned profile value of a standard type.
+*
+* @param[in] pToolpathLayer - ToolpathLayer instance.
+* @param[in] eValueType - Enum to query for. MUST NOT be custom.
+* @param[out] pValue - Double Value
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvToolpathLayer_GetSegmentProfileTypedValuePtr) (LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv::eToolpathProfileValueType eValueType, LibMCEnv_double * pValue);
+
 /**
 * Retrieves the assigned segment part uuid.
 *
@@ -113,25 +135,43 @@ typedef LibMCEnvResult (*PLibMCEnvToolpathLayer_GetSegmentPartUUIDPtr) (LibMCEnv
 * @param[in] nIndex - Index. Must be between 0 and Count - 1.
 * @param[in] nPointDataBufferSize - Number of elements in buffer
 * @param[out] pPointDataNeededCount - will be filled with the count of the written elements, or needed buffer size.
-* @param[out] pPointDataBuffer - Position2D buffer of The point data array
+* @param[out] pPointDataBuffer - Position2D buffer of The point data array. Positions are absolute in units.
 * @return error code or 0 (success)
 */
 typedef LibMCEnvResult (*PLibMCEnvToolpathLayer_GetSegmentPointDataPtr) (LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_uint32 nIndex, const LibMCEnv_uint64 nPointDataBufferSize, LibMCEnv_uint64* pPointDataNeededCount, LibMCEnv::sPosition2D * pPointDataBuffer);
 
+/**
+* Retrieves the layers Z Value in units.
+*
+* @param[in] pToolpathLayer - ToolpathLayer instance.
+* @param[out] pZValue - Z Value of the layer in units.
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvToolpathLayer_GetZValuePtr) (LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_int32 * pZValue);
+
+/**
+* Retrieves the toolpath units in mm.
+*
+* @param[in] pToolpathLayer - ToolpathLayer instance.
+* @param[out] pUnits - Toolpath units.
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvToolpathLayer_GetUnitsPtr) (LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_double * pUnits);
+
 /*************************************************************************************************************************
  Class definition for ToolpathAccessor
 **************************************************************************************************************************/
 
 /**
-* Returns Toolpath data UUID.
+* Returns Toolpath storage UUID.
 *
 * @param[in] pToolpathAccessor - ToolpathAccessor instance.
-* @param[in] nUUIDBufferSize - size of the buffer (including trailing 0)
-* @param[out] pUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
-* @param[out] pUUIDBuffer -  buffer of Returns toolpath data uuid., may be NULL
+* @param[in] nStorageUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pStorageUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pStorageUUIDBuffer -  buffer of Returns toolpath storage uuid., may be NULL
 * @return error code or 0 (success)
 */
-typedef LibMCEnvResult (*PLibMCEnvToolpathAccessor_GetUUIDPtr) (LibMCEnv_ToolpathAccessor pToolpathAccessor, const LibMCEnv_uint32 nUUIDBufferSize, LibMCEnv_uint32* pUUIDNeededChars, char * pUUIDBuffer);
+typedef LibMCEnvResult (*PLibMCEnvToolpathAccessor_GetStorageUUIDPtr) (LibMCEnv_ToolpathAccessor pToolpathAccessor, const LibMCEnv_uint32 nStorageUUIDBufferSize, LibMCEnv_uint32* pStorageUUIDNeededChars, char * pStorageUUIDBuffer);
 
 /**
 * Returns layer count.
@@ -152,6 +192,121 @@ typedef LibMCEnvResult (*PLibMCEnvToolpathAccessor_GetLayerCountPtr) (LibMCEnv_T
 */
 typedef LibMCEnvResult (*PLibMCEnvToolpathAccessor_LoadLayerPtr) (LibMCEnv_ToolpathAccessor pToolpathAccessor, LibMCEnv_uint32 nLayerIndex, LibMCEnv_ToolpathLayer * pLayerData);
 
+/**
+* Retrieves the toolpath units in mm.
+*
+* @param[in] pToolpathAccessor - ToolpathAccessor instance.
+* @param[out] pUnits - Toolpath units.
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvToolpathAccessor_GetUnitsPtr) (LibMCEnv_ToolpathAccessor pToolpathAccessor, LibMCEnv_double * pUnits);
+
+/*************************************************************************************************************************
+ Class definition for Build
+**************************************************************************************************************************/
+
+/**
+* Returns name of the build.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name of the build., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvBuild_GetNamePtr) (LibMCEnv_Build pBuild, const LibMCEnv_uint32 nNameBufferSize, LibMCEnv_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* Returns uuid of the build.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] nBuildUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBuildUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBuildUUIDBuffer -  buffer of UUID of the build., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvBuild_GetBuildUUIDPtr) (LibMCEnv_Build pBuild, const LibMCEnv_uint32 nBuildUUIDBufferSize, LibMCEnv_uint32* pBuildUUIDNeededChars, char * pBuildUUIDBuffer);
+
+/**
+* Returns storage uuid of the build.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] nStorageUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pStorageUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pStorageUUIDBuffer -  buffer of Storage UUID of the build., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvBuild_GetStorageUUIDPtr) (LibMCEnv_Build pBuild, const LibMCEnv_uint32 nStorageUUIDBufferSize, LibMCEnv_uint32* pStorageUUIDNeededChars, char * pStorageUUIDBuffer);
+
+/**
+* Returns SHA256 of the build stream.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] nSHA256BufferSize - size of the buffer (including trailing 0)
+* @param[out] pSHA256NeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pSHA256Buffer -  buffer of SHA256 of the build stream., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvBuild_GetStorageSHA256Ptr) (LibMCEnv_Build pBuild, const LibMCEnv_uint32 nSHA256BufferSize, LibMCEnv_uint32* pSHA256NeededChars, char * pSHA256Buffer);
+
+/**
+* Returns cached layer count of the toolpath.
+*
+* @param[in] pBuild - Build instance.
+* @param[out] pLayerCount - Returns layer count.
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvBuild_GetLayerCountPtr) (LibMCEnv_Build pBuild, LibMCEnv_uint32 * pLayerCount);
+
+/**
+* loads the a toolpath into memory
+*
+* @param[in] pBuild - Build instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvBuild_LoadToolpathPtr) (LibMCEnv_Build pBuild);
+
+/**
+* unloads the a toolpath from memory, if it has been loaded before.
+*
+* @param[in] pBuild - Build instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvBuild_UnloadToolpathPtr) (LibMCEnv_Build pBuild);
+
+/**
+* checks, if a toolpath object is loaded to memory.
+*
+* @param[in] pBuild - Build instance.
+* @param[out] pIsLoaded - returns if toolpath is loaded.
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvBuild_ToolpathIsLoadedPtr) (LibMCEnv_Build pBuild, bool * pIsLoaded);
+
+/**
+* Creates an accessor object for a toolpath. Toolpath MUST have been loaded with LoadToolpath before.
+*
+* @param[in] pBuild - Build instance.
+* @param[out] pToolpathInstance - Toolpath instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvBuild_CreateToolpathAccessorPtr) (LibMCEnv_Build pBuild, LibMCEnv_ToolpathAccessor * pToolpathInstance);
+
+/**
+* Adds binary data to store with the build.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] pName - Name of the attache data block.
+* @param[in] pMIMEType - Mime type of the data.
+* @param[in] nContentBufferSize - Number of elements in buffer
+* @param[in] pContentBuffer - uint8 buffer of Stream content to store
+* @param[in] nDataUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pDataUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pDataUUIDBuffer -  buffer of Data UUID of the attachment., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvBuild_AddBinaryDataPtr) (LibMCEnv_Build pBuild, const char * pName, const char * pMIMEType, LibMCEnv_uint64 nContentBufferSize, const LibMCEnv_uint8 * pContentBuffer, const LibMCEnv_uint32 nDataUUIDBufferSize, LibMCEnv_uint32* pDataUUIDNeededChars, char * pDataUUIDBuffer);
+
 /*************************************************************************************************************************
  Class definition for SignalTrigger
 **************************************************************************************************************************/
@@ -215,6 +370,16 @@ typedef LibMCEnvResult (*PLibMCEnvSignalTrigger_GetStateMachinePtr) (LibMCEnv_Si
 */
 typedef LibMCEnvResult (*PLibMCEnvSignalTrigger_SetStringPtr) (LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, const char * pValue);
 
+/**
+* sets a uuid value
+*
+* @param[in] pSignalTrigger - SignalTrigger instance.
+* @param[in] pName - Name
+* @param[in] pValue - Value
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvSignalTrigger_SetUUIDPtr) (LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, const char * pValue);
+
 /**
 * sets a double
 *
@@ -257,6 +422,18 @@ typedef LibMCEnvResult (*PLibMCEnvSignalTrigger_SetBoolPtr) (LibMCEnv_SignalTrig
 */
 typedef LibMCEnvResult (*PLibMCEnvSignalTrigger_GetStringResultPtr) (LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
 
+/**
+* returns a uuid value of the result
+*
+* @param[in] pSignalTrigger - SignalTrigger instance.
+* @param[in] pName - Name
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of Value, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvSignalTrigger_GetUUIDResultPtr) (LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
 /**
 * returns a string value of the result
 *
@@ -344,6 +521,18 @@ typedef LibMCEnvResult (*PLibMCEnvSignalHandler_GetStateMachinePtr) (LibMCEnv_Si
 */
 typedef LibMCEnvResult (*PLibMCEnvSignalHandler_GetStringPtr) (LibMCEnv_SignalHandler pSignalHandler, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
 
+/**
+* gets a uuid value
+*
+* @param[in] pSignalHandler - SignalHandler instance.
+* @param[in] pName - Name
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of Value, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvSignalHandler_GetUUIDPtr) (LibMCEnv_SignalHandler pSignalHandler, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
 /**
 * gets a double
 *
@@ -384,6 +573,16 @@ typedef LibMCEnvResult (*PLibMCEnvSignalHandler_GetBoolPtr) (LibMCEnv_SignalHand
 */
 typedef LibMCEnvResult (*PLibMCEnvSignalHandler_SetStringResultPtr) (LibMCEnv_SignalHandler pSignalHandler, const char * pName, const char * pValue);
 
+/**
+* returns a uuid value of the result
+*
+* @param[in] pSignalHandler - SignalHandler instance.
+* @param[in] pName - Name
+* @param[in] pValue - Value
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvSignalHandler_SetUUIDResultPtr) (LibMCEnv_SignalHandler pSignalHandler, const char * pName, const char * pValue);
+
 /**
 * returns a string value of the result
 *
@@ -419,7 +618,7 @@ typedef LibMCEnvResult (*PLibMCEnvSignalHandler_SetBoolResultPtr) (LibMCEnv_Sign
 **************************************************************************************************************************/
 
 /**
-* creates a signal object to trigger.
+* prepares a signal object to trigger later.
 *
 * @param[in] pStateEnvironment - StateEnvironment instance.
 * @param[in] pMachineInstance - State machine instance name
@@ -427,7 +626,7 @@ typedef LibMCEnvResult (*PLibMCEnvSignalHandler_SetBoolResultPtr) (LibMCEnv_Sign
 * @param[out] pSignalInstance - Signal trigger object.
 * @return error code or 0 (success)
 */
-typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_CreateSignalPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pMachineInstance, const char * pSignalName, LibMCEnv_SignalTrigger * pSignalInstance);
+typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_PrepareSignalPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pMachineInstance, const char * pSignalName, LibMCEnv_SignalTrigger * pSignalInstance);
 
 /**
 * waits for a signal.
@@ -465,22 +664,14 @@ typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_GetDriverLibraryPtr) (LibMCEn
 typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_CreateDriverAccessPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pDriverName, LibMCEnv_pvoid * pDriverHandle);
 
 /**
-* Loads a toolpath from disk into memory.
+* Returns a instance of a build object.
 *
 * @param[in] pStateEnvironment - StateEnvironment instance.
-* @param[in] pToolpathUUID - UUID of the toolpath entity.
+* @param[in] pBuildUUID - UUID of the build entity.
+* @param[out] pBuildInstance - Build instance
 * @return error code or 0 (success)
 */
-typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_LoadToolpathPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID);
-
-/**
-* unloads the a toolpath. It MUST have been loaded to memory before with LoadToolpath.
-*
-* @param[in] pStateEnvironment - StateEnvironment instance.
-* @param[in] pToolpathUUID - UUID of the toolpath entity.
-* @return error code or 0 (success)
-*/
-typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_UnloadToolpathPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID);
+typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_GetBuildJobPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pBuildUUID, LibMCEnv_Build * pBuildInstance);
 
 /**
 * unloads all toolpath in memory to clean up
@@ -490,26 +681,6 @@ typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_UnloadToolpathPtr) (LibMCEnv_
 */
 typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_UnloadAllToolpathesPtr) (LibMCEnv_StateEnvironment pStateEnvironment);
 
-/**
-* creates an accessor object for a toolpath, if loaded to memory before.
-*
-* @param[in] pStateEnvironment - StateEnvironment instance.
-* @param[in] pToolpathUUID - UUID of the toolpath entity.
-* @param[out] pToolpathInstance - UUID of the toolpath entity.
-* @return error code or 0 (success)
-*/
-typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_CreateToolpathAccessorPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID, LibMCEnv_ToolpathAccessor * pToolpathInstance);
-
-/**
-* checks, if a toolpath object is loaded to memory.
-*
-* @param[in] pStateEnvironment - StateEnvironment instance.
-* @param[in] pToolpathUUID - UUID of the toolpath entity.
-* @param[out] pIsLoaded - returns if toolpath is loaded.
-* @return error code or 0 (success)
-*/
-typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_ToolpathIsLoadedPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID, bool * pIsLoaded);
-
 /**
 * sets the next state
 *
@@ -574,6 +745,16 @@ typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_CheckForTerminationPtr) (LibM
 */
 typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_StoreStringPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const char * pValue);
 
+/**
+* stores a uuid in the current state machine
+*
+* @param[in] pStateEnvironment - StateEnvironment instance.
+* @param[in] pName - Name
+* @param[in] pValue - Value
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_StoreUUIDPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const char * pValue);
+
 /**
 * stores a string in the current state machine
 *
@@ -626,6 +807,18 @@ typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_StoreSignalPtr) (LibMCEnv_Sta
 */
 typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_RetrieveStringPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
 
+/**
+* retrieves a uuid from the current state machine. Fails if value has not been stored before.
+*
+* @param[in] pStateEnvironment - StateEnvironment instance.
+* @param[in] pName - Name
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of Value, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_RetrieveUUIDPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
 /**
 * retrieves a string from the current state machine. Fails if value has not been stored before.
 *
@@ -686,6 +879,17 @@ typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_ClearStoredValuePtr) (LibMCEn
 */
 typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_SetStringParameterPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, const char * pValue);
 
+/**
+* sets a uuid parameter
+*
+* @param[in] pStateEnvironment - StateEnvironment instance.
+* @param[in] pParameterGroup - Parameter Group
+* @param[in] pParameterName - Parameter Name
+* @param[in] pValue - Value to set
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_SetUUIDParameterPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, const char * pValue);
+
 /**
 * sets a double parameter
 *
@@ -732,6 +936,19 @@ typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_SetBoolParameterPtr) (LibMCEn
 */
 typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_GetStringParameterPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
 
+/**
+* returns a uuid parameter
+*
+* @param[in] pStateEnvironment - StateEnvironment instance.
+* @param[in] pParameterGroup - Parameter Group
+* @param[in] pParameterName - Parameter Name
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of Value to set, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCEnvResult (*PLibMCEnvStateEnvironment_GetUUIDParameterPtr) (LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
 /**
 * returns a double parameter
 *
@@ -825,21 +1042,38 @@ typedef struct {
 	PLibMCEnvToolpathLayer_GetSegmentCountPtr m_ToolpathLayer_GetSegmentCount;
 	PLibMCEnvToolpathLayer_GetSegmentInfoPtr m_ToolpathLayer_GetSegmentInfo;
 	PLibMCEnvToolpathLayer_GetSegmentProfileUUIDPtr m_ToolpathLayer_GetSegmentProfileUUID;
+	PLibMCEnvToolpathLayer_GetSegmentProfileValuePtr m_ToolpathLayer_GetSegmentProfileValue;
+	PLibMCEnvToolpathLayer_GetSegmentProfileTypedValuePtr m_ToolpathLayer_GetSegmentProfileTypedValue;
 	PLibMCEnvToolpathLayer_GetSegmentPartUUIDPtr m_ToolpathLayer_GetSegmentPartUUID;
 	PLibMCEnvToolpathLayer_GetSegmentPointDataPtr m_ToolpathLayer_GetSegmentPointData;
-	PLibMCEnvToolpathAccessor_GetUUIDPtr m_ToolpathAccessor_GetUUID;
+	PLibMCEnvToolpathLayer_GetZValuePtr m_ToolpathLayer_GetZValue;
+	PLibMCEnvToolpathLayer_GetUnitsPtr m_ToolpathLayer_GetUnits;
+	PLibMCEnvToolpathAccessor_GetStorageUUIDPtr m_ToolpathAccessor_GetStorageUUID;
 	PLibMCEnvToolpathAccessor_GetLayerCountPtr m_ToolpathAccessor_GetLayerCount;
 	PLibMCEnvToolpathAccessor_LoadLayerPtr m_ToolpathAccessor_LoadLayer;
+	PLibMCEnvToolpathAccessor_GetUnitsPtr m_ToolpathAccessor_GetUnits;
+	PLibMCEnvBuild_GetNamePtr m_Build_GetName;
+	PLibMCEnvBuild_GetBuildUUIDPtr m_Build_GetBuildUUID;
+	PLibMCEnvBuild_GetStorageUUIDPtr m_Build_GetStorageUUID;
+	PLibMCEnvBuild_GetStorageSHA256Ptr m_Build_GetStorageSHA256;
+	PLibMCEnvBuild_GetLayerCountPtr m_Build_GetLayerCount;
+	PLibMCEnvBuild_LoadToolpathPtr m_Build_LoadToolpath;
+	PLibMCEnvBuild_UnloadToolpathPtr m_Build_UnloadToolpath;
+	PLibMCEnvBuild_ToolpathIsLoadedPtr m_Build_ToolpathIsLoaded;
+	PLibMCEnvBuild_CreateToolpathAccessorPtr m_Build_CreateToolpathAccessor;
+	PLibMCEnvBuild_AddBinaryDataPtr m_Build_AddBinaryData;
 	PLibMCEnvSignalTrigger_CanTriggerPtr m_SignalTrigger_CanTrigger;
 	PLibMCEnvSignalTrigger_TriggerPtr m_SignalTrigger_Trigger;
 	PLibMCEnvSignalTrigger_WaitForHandlingPtr m_SignalTrigger_WaitForHandling;
 	PLibMCEnvSignalTrigger_GetNamePtr m_SignalTrigger_GetName;
 	PLibMCEnvSignalTrigger_GetStateMachinePtr m_SignalTrigger_GetStateMachine;
 	PLibMCEnvSignalTrigger_SetStringPtr m_SignalTrigger_SetString;
+	PLibMCEnvSignalTrigger_SetUUIDPtr m_SignalTrigger_SetUUID;
 	PLibMCEnvSignalTrigger_SetDoublePtr m_SignalTrigger_SetDouble;
 	PLibMCEnvSignalTrigger_SetIntegerPtr m_SignalTrigger_SetInteger;
 	PLibMCEnvSignalTrigger_SetBoolPtr m_SignalTrigger_SetBool;
 	PLibMCEnvSignalTrigger_GetStringResultPtr m_SignalTrigger_GetStringResult;
+	PLibMCEnvSignalTrigger_GetUUIDResultPtr m_SignalTrigger_GetUUIDResult;
 	PLibMCEnvSignalTrigger_GetDoubleResultPtr m_SignalTrigger_GetDoubleResult;
 	PLibMCEnvSignalTrigger_GetIntegerResultPtr m_SignalTrigger_GetIntegerResult;
 	PLibMCEnvSignalTrigger_GetBoolResultPtr m_SignalTrigger_GetBoolResult;
@@ -848,22 +1082,21 @@ typedef struct {
 	PLibMCEnvSignalHandler_GetSignalIDPtr m_SignalHandler_GetSignalID;
 	PLibMCEnvSignalHandler_GetStateMachinePtr m_SignalHandler_GetStateMachine;
 	PLibMCEnvSignalHandler_GetStringPtr m_SignalHandler_GetString;
+	PLibMCEnvSignalHandler_GetUUIDPtr m_SignalHandler_GetUUID;
 	PLibMCEnvSignalHandler_GetDoublePtr m_SignalHandler_GetDouble;
 	PLibMCEnvSignalHandler_GetIntegerPtr m_SignalHandler_GetInteger;
 	PLibMCEnvSignalHandler_GetBoolPtr m_SignalHandler_GetBool;
 	PLibMCEnvSignalHandler_SetStringResultPtr m_SignalHandler_SetStringResult;
+	PLibMCEnvSignalHandler_SetUUIDResultPtr m_SignalHandler_SetUUIDResult;
 	PLibMCEnvSignalHandler_SetDoubleResultPtr m_SignalHandler_SetDoubleResult;
 	PLibMCEnvSignalHandler_SetIntegerResultPtr m_SignalHandler_SetIntegerResult;
 	PLibMCEnvSignalHandler_SetBoolResultPtr m_SignalHandler_SetBoolResult;
-	PLibMCEnvStateEnvironment_CreateSignalPtr m_StateEnvironment_CreateSignal;
+	PLibMCEnvStateEnvironment_PrepareSignalPtr m_StateEnvironment_PrepareSignal;
 	PLibMCEnvStateEnvironment_WaitForSignalPtr m_StateEnvironment_WaitForSignal;
 	PLibMCEnvStateEnvironment_GetDriverLibraryPtr m_StateEnvironment_GetDriverLibrary;
 	PLibMCEnvStateEnvironment_CreateDriverAccessPtr m_StateEnvironment_CreateDriverAccess;
-	PLibMCEnvStateEnvironment_LoadToolpathPtr m_StateEnvironment_LoadToolpath;
-	PLibMCEnvStateEnvironment_UnloadToolpathPtr m_StateEnvironment_UnloadToolpath;
+	PLibMCEnvStateEnvironment_GetBuildJobPtr m_StateEnvironment_GetBuildJob;
 	PLibMCEnvStateEnvironment_UnloadAllToolpathesPtr m_StateEnvironment_UnloadAllToolpathes;
-	PLibMCEnvStateEnvironment_CreateToolpathAccessorPtr m_StateEnvironment_CreateToolpathAccessor;
-	PLibMCEnvStateEnvironment_ToolpathIsLoadedPtr m_StateEnvironment_ToolpathIsLoaded;
 	PLibMCEnvStateEnvironment_SetNextStatePtr m_StateEnvironment_SetNextState;
 	PLibMCEnvStateEnvironment_LogMessagePtr m_StateEnvironment_LogMessage;
 	PLibMCEnvStateEnvironment_LogWarningPtr m_StateEnvironment_LogWarning;
@@ -871,21 +1104,25 @@ typedef struct {
 	PLibMCEnvStateEnvironment_SleepPtr m_StateEnvironment_Sleep;
 	PLibMCEnvStateEnvironment_CheckForTerminationPtr m_StateEnvironment_CheckForTermination;
 	PLibMCEnvStateEnvironment_StoreStringPtr m_StateEnvironment_StoreString;
+	PLibMCEnvStateEnvironment_StoreUUIDPtr m_StateEnvironment_StoreUUID;
 	PLibMCEnvStateEnvironment_StoreIntegerPtr m_StateEnvironment_StoreInteger;
 	PLibMCEnvStateEnvironment_StoreDoublePtr m_StateEnvironment_StoreDouble;
 	PLibMCEnvStateEnvironment_StoreBoolPtr m_StateEnvironment_StoreBool;
 	PLibMCEnvStateEnvironment_StoreSignalPtr m_StateEnvironment_StoreSignal;
 	PLibMCEnvStateEnvironment_RetrieveStringPtr m_StateEnvironment_RetrieveString;
+	PLibMCEnvStateEnvironment_RetrieveUUIDPtr m_StateEnvironment_RetrieveUUID;
 	PLibMCEnvStateEnvironment_RetrieveIntegerPtr m_StateEnvironment_RetrieveInteger;
 	PLibMCEnvStateEnvironment_RetrieveDoublePtr m_StateEnvironment_RetrieveDouble;
 	PLibMCEnvStateEnvironment_RetrieveBoolPtr m_StateEnvironment_RetrieveBool;
 	PLibMCEnvStateEnvironment_RetrieveSignalPtr m_StateEnvironment_RetrieveSignal;
 	PLibMCEnvStateEnvironment_ClearStoredValuePtr m_StateEnvironment_ClearStoredValue;
 	PLibMCEnvStateEnvironment_SetStringParameterPtr m_StateEnvironment_SetStringParameter;
+	PLibMCEnvStateEnvironment_SetUUIDParameterPtr m_StateEnvironment_SetUUIDParameter;
 	PLibMCEnvStateEnvironment_SetDoubleParameterPtr m_StateEnvironment_SetDoubleParameter;
 	PLibMCEnvStateEnvironment_SetIntegerParameterPtr m_StateEnvironment_SetIntegerParameter;
 	PLibMCEnvStateEnvironment_SetBoolParameterPtr m_StateEnvironment_SetBoolParameter;
 	PLibMCEnvStateEnvironment_GetStringParameterPtr m_StateEnvironment_GetStringParameter;
+	PLibMCEnvStateEnvironment_GetUUIDParameterPtr m_StateEnvironment_GetUUIDParameter;
 	PLibMCEnvStateEnvironment_GetDoubleParameterPtr m_StateEnvironment_GetDoubleParameter;
 	PLibMCEnvStateEnvironment_GetIntegerParameterPtr m_StateEnvironment_GetIntegerParameter;
 	PLibMCEnvStateEnvironment_GetBoolParameterPtr m_StateEnvironment_GetBoolParameter;
diff --git a/Framework/HeadersDev/CppDynamic/libmcenv_dynamic.hpp b/Framework/HeadersDev/CppDynamic/libmcenv_dynamic.hpp
index 7e6c831d..f0e85533 100644
--- a/Framework/HeadersDev/CppDynamic/libmcenv_dynamic.hpp
+++ b/Framework/HeadersDev/CppDynamic/libmcenv_dynamic.hpp
@@ -62,6 +62,7 @@ class CWrapper;
 class CBase;
 class CToolpathLayer;
 class CToolpathAccessor;
+class CBuild;
 class CSignalTrigger;
 class CSignalHandler;
 class CStateEnvironment;
@@ -73,6 +74,7 @@ typedef CWrapper CLibMCEnvWrapper;
 typedef CBase CLibMCEnvBase;
 typedef CToolpathLayer CLibMCEnvToolpathLayer;
 typedef CToolpathAccessor CLibMCEnvToolpathAccessor;
+typedef CBuild CLibMCEnvBuild;
 typedef CSignalTrigger CLibMCEnvSignalTrigger;
 typedef CSignalHandler CLibMCEnvSignalHandler;
 typedef CStateEnvironment CLibMCEnvStateEnvironment;
@@ -84,6 +86,7 @@ typedef std::shared_ptr<CWrapper> PWrapper;
 typedef std::shared_ptr<CBase> PBase;
 typedef std::shared_ptr<CToolpathLayer> PToolpathLayer;
 typedef std::shared_ptr<CToolpathAccessor> PToolpathAccessor;
+typedef std::shared_ptr<CBuild> PBuild;
 typedef std::shared_ptr<CSignalTrigger> PSignalTrigger;
 typedef std::shared_ptr<CSignalHandler> PSignalHandler;
 typedef std::shared_ptr<CStateEnvironment> PStateEnvironment;
@@ -95,6 +98,7 @@ typedef PWrapper PLibMCEnvWrapper;
 typedef PBase PLibMCEnvBase;
 typedef PToolpathLayer PLibMCEnvToolpathLayer;
 typedef PToolpathAccessor PLibMCEnvToolpathAccessor;
+typedef PBuild PLibMCEnvBuild;
 typedef PSignalTrigger PLibMCEnvSignalTrigger;
 typedef PSignalHandler PLibMCEnvSignalHandler;
 typedef PStateEnvironment PLibMCEnvStateEnvironment;
@@ -272,6 +276,7 @@ class CWrapper {
 	friend class CBase;
 	friend class CToolpathLayer;
 	friend class CToolpathAccessor;
+	friend class CBuild;
 	friend class CSignalTrigger;
 	friend class CSignalHandler;
 	friend class CStateEnvironment;
@@ -353,8 +358,12 @@ class CToolpathLayer : public CBase {
 	inline LibMCEnv_uint32 GetSegmentCount();
 	inline void GetSegmentInfo(const LibMCEnv_uint32 nIndex, eToolpathSegmentType & eType, LibMCEnv_uint32 & nPointCount);
 	inline std::string GetSegmentProfileUUID(const LibMCEnv_uint32 nIndex);
+	inline std::string GetSegmentProfileValue(const std::string & sValueName);
+	inline LibMCEnv_double GetSegmentProfileTypedValue(const eToolpathProfileValueType eValueType);
 	inline std::string GetSegmentPartUUID(const LibMCEnv_uint32 nIndex);
 	inline void GetSegmentPointData(const LibMCEnv_uint32 nIndex, std::vector<sPosition2D> & PointDataBuffer);
+	inline LibMCEnv_int32 GetZValue();
+	inline LibMCEnv_double GetUnits();
 };
 	
 /*************************************************************************************************************************
@@ -371,9 +380,36 @@ class CToolpathAccessor : public CBase {
 	{
 	}
 	
-	inline std::string GetUUID();
+	inline std::string GetStorageUUID();
 	inline LibMCEnv_uint32 GetLayerCount();
 	inline PToolpathLayer LoadLayer(const LibMCEnv_uint32 nLayerIndex);
+	inline LibMCEnv_double GetUnits();
+};
+	
+/*************************************************************************************************************************
+ Class CBuild 
+**************************************************************************************************************************/
+class CBuild : public CBase {
+public:
+	
+	/**
+	* CBuild::CBuild - Constructor for Build class.
+	*/
+	CBuild(CWrapper* pWrapper, LibMCEnvHandle pHandle)
+		: CBase(pWrapper, pHandle)
+	{
+	}
+	
+	inline std::string GetName();
+	inline std::string GetBuildUUID();
+	inline std::string GetStorageUUID();
+	inline std::string GetStorageSHA256();
+	inline LibMCEnv_uint32 GetLayerCount();
+	inline void LoadToolpath();
+	inline void UnloadToolpath();
+	inline bool ToolpathIsLoaded();
+	inline PToolpathAccessor CreateToolpathAccessor();
+	inline std::string AddBinaryData(const std::string & sName, const std::string & sMIMEType, const CInputVector<LibMCEnv_uint8> & ContentBuffer);
 };
 	
 /*************************************************************************************************************************
@@ -396,10 +432,12 @@ class CSignalTrigger : public CBase {
 	inline std::string GetName();
 	inline std::string GetStateMachine();
 	inline void SetString(const std::string & sName, const std::string & sValue);
+	inline void SetUUID(const std::string & sName, const std::string & sValue);
 	inline void SetDouble(const std::string & sName, const LibMCEnv_double dValue);
 	inline void SetInteger(const std::string & sName, const LibMCEnv_int64 nValue);
 	inline void SetBool(const std::string & sName, const bool bValue);
 	inline std::string GetStringResult(const std::string & sName);
+	inline std::string GetUUIDResult(const std::string & sName);
 	inline LibMCEnv_double GetDoubleResult(const std::string & sName);
 	inline LibMCEnv_int64 GetIntegerResult(const std::string & sName);
 	inline bool GetBoolResult(const std::string & sName);
@@ -424,10 +462,12 @@ class CSignalHandler : public CBase {
 	inline std::string GetSignalID();
 	inline std::string GetStateMachine();
 	inline std::string GetString(const std::string & sName);
+	inline std::string GetUUID(const std::string & sName);
 	inline LibMCEnv_double GetDouble(const std::string & sName);
 	inline LibMCEnv_int64 GetInteger(const std::string & sName);
 	inline bool GetBool(const std::string & sName);
 	inline void SetStringResult(const std::string & sName, const std::string & sValue);
+	inline void SetUUIDResult(const std::string & sName, const std::string & sValue);
 	inline void SetDoubleResult(const std::string & sName, const LibMCEnv_double dValue);
 	inline void SetIntegerResult(const std::string & sName, const LibMCEnv_int64 nValue);
 	inline void SetBoolResult(const std::string & sName, const bool bValue);
@@ -447,15 +487,12 @@ class CStateEnvironment : public CBase {
 	{
 	}
 	
-	inline PSignalTrigger CreateSignal(const std::string & sMachineInstance, const std::string & sSignalName);
+	inline PSignalTrigger PrepareSignal(const std::string & sMachineInstance, const std::string & sSignalName);
 	inline bool WaitForSignal(const std::string & sSignalName, const LibMCEnv_uint32 nTimeOut, PSignalHandler & pHandlerInstance);
 	inline void GetDriverLibrary(const std::string & sDriverName, std::string & sDriverType, LibMCEnv_pvoid & pDriverLookup);
 	inline void CreateDriverAccess(const std::string & sDriverName, LibMCEnv_pvoid & pDriverHandle);
-	inline void LoadToolpath(const std::string & sToolpathUUID);
-	inline void UnloadToolpath(const std::string & sToolpathUUID);
+	inline PBuild GetBuildJob(const std::string & sBuildUUID);
 	inline void UnloadAllToolpathes();
-	inline PToolpathAccessor CreateToolpathAccessor(const std::string & sToolpathUUID);
-	inline bool ToolpathIsLoaded(const std::string & sToolpathUUID);
 	inline void SetNextState(const std::string & sStateName);
 	inline void LogMessage(const std::string & sLogString);
 	inline void LogWarning(const std::string & sLogString);
@@ -463,21 +500,25 @@ class CStateEnvironment : public CBase {
 	inline void Sleep(const LibMCEnv_uint32 nDelay);
 	inline bool CheckForTermination();
 	inline void StoreString(const std::string & sName, const std::string & sValue);
+	inline void StoreUUID(const std::string & sName, const std::string & sValue);
 	inline void StoreInteger(const std::string & sName, const LibMCEnv_int64 nValue);
 	inline void StoreDouble(const std::string & sName, const LibMCEnv_double dValue);
 	inline void StoreBool(const std::string & sName, const bool bValue);
 	inline void StoreSignal(const std::string & sName, classParam<CSignalHandler> pHandler);
 	inline std::string RetrieveString(const std::string & sName);
+	inline std::string RetrieveUUID(const std::string & sName);
 	inline LibMCEnv_int64 RetrieveInteger(const std::string & sName);
 	inline LibMCEnv_double RetrieveDouble(const std::string & sName);
 	inline bool RetrieveBool(const std::string & sName);
 	inline PSignalHandler RetrieveSignal(const std::string & sName);
 	inline void ClearStoredValue(const std::string & sName);
 	inline void SetStringParameter(const std::string & sParameterGroup, const std::string & sParameterName, const std::string & sValue);
+	inline void SetUUIDParameter(const std::string & sParameterGroup, const std::string & sParameterName, const std::string & sValue);
 	inline void SetDoubleParameter(const std::string & sParameterGroup, const std::string & sParameterName, const LibMCEnv_double dValue);
 	inline void SetIntegerParameter(const std::string & sParameterGroup, const std::string & sParameterName, const LibMCEnv_int64 nValue);
 	inline void SetBoolParameter(const std::string & sParameterGroup, const std::string & sParameterName, const bool bValue);
 	inline std::string GetStringParameter(const std::string & sParameterGroup, const std::string & sParameterName);
+	inline std::string GetUUIDParameter(const std::string & sParameterGroup, const std::string & sParameterName);
 	inline LibMCEnv_double GetDoubleParameter(const std::string & sParameterGroup, const std::string & sParameterName);
 	inline LibMCEnv_int64 GetIntegerParameter(const std::string & sParameterGroup, const std::string & sParameterName);
 	inline bool GetBoolParameter(const std::string & sParameterGroup, const std::string & sParameterName);
@@ -568,21 +609,38 @@ class CStateEnvironment : public CBase {
 		pWrapperTable->m_ToolpathLayer_GetSegmentCount = nullptr;
 		pWrapperTable->m_ToolpathLayer_GetSegmentInfo = nullptr;
 		pWrapperTable->m_ToolpathLayer_GetSegmentProfileUUID = nullptr;
+		pWrapperTable->m_ToolpathLayer_GetSegmentProfileValue = nullptr;
+		pWrapperTable->m_ToolpathLayer_GetSegmentProfileTypedValue = nullptr;
 		pWrapperTable->m_ToolpathLayer_GetSegmentPartUUID = nullptr;
 		pWrapperTable->m_ToolpathLayer_GetSegmentPointData = nullptr;
-		pWrapperTable->m_ToolpathAccessor_GetUUID = nullptr;
+		pWrapperTable->m_ToolpathLayer_GetZValue = nullptr;
+		pWrapperTable->m_ToolpathLayer_GetUnits = nullptr;
+		pWrapperTable->m_ToolpathAccessor_GetStorageUUID = nullptr;
 		pWrapperTable->m_ToolpathAccessor_GetLayerCount = nullptr;
 		pWrapperTable->m_ToolpathAccessor_LoadLayer = nullptr;
+		pWrapperTable->m_ToolpathAccessor_GetUnits = nullptr;
+		pWrapperTable->m_Build_GetName = nullptr;
+		pWrapperTable->m_Build_GetBuildUUID = nullptr;
+		pWrapperTable->m_Build_GetStorageUUID = nullptr;
+		pWrapperTable->m_Build_GetStorageSHA256 = nullptr;
+		pWrapperTable->m_Build_GetLayerCount = nullptr;
+		pWrapperTable->m_Build_LoadToolpath = nullptr;
+		pWrapperTable->m_Build_UnloadToolpath = nullptr;
+		pWrapperTable->m_Build_ToolpathIsLoaded = nullptr;
+		pWrapperTable->m_Build_CreateToolpathAccessor = nullptr;
+		pWrapperTable->m_Build_AddBinaryData = nullptr;
 		pWrapperTable->m_SignalTrigger_CanTrigger = nullptr;
 		pWrapperTable->m_SignalTrigger_Trigger = nullptr;
 		pWrapperTable->m_SignalTrigger_WaitForHandling = nullptr;
 		pWrapperTable->m_SignalTrigger_GetName = nullptr;
 		pWrapperTable->m_SignalTrigger_GetStateMachine = nullptr;
 		pWrapperTable->m_SignalTrigger_SetString = nullptr;
+		pWrapperTable->m_SignalTrigger_SetUUID = nullptr;
 		pWrapperTable->m_SignalTrigger_SetDouble = nullptr;
 		pWrapperTable->m_SignalTrigger_SetInteger = nullptr;
 		pWrapperTable->m_SignalTrigger_SetBool = nullptr;
 		pWrapperTable->m_SignalTrigger_GetStringResult = nullptr;
+		pWrapperTable->m_SignalTrigger_GetUUIDResult = nullptr;
 		pWrapperTable->m_SignalTrigger_GetDoubleResult = nullptr;
 		pWrapperTable->m_SignalTrigger_GetIntegerResult = nullptr;
 		pWrapperTable->m_SignalTrigger_GetBoolResult = nullptr;
@@ -591,22 +649,21 @@ class CStateEnvironment : public CBase {
 		pWrapperTable->m_SignalHandler_GetSignalID = nullptr;
 		pWrapperTable->m_SignalHandler_GetStateMachine = nullptr;
 		pWrapperTable->m_SignalHandler_GetString = nullptr;
+		pWrapperTable->m_SignalHandler_GetUUID = nullptr;
 		pWrapperTable->m_SignalHandler_GetDouble = nullptr;
 		pWrapperTable->m_SignalHandler_GetInteger = nullptr;
 		pWrapperTable->m_SignalHandler_GetBool = nullptr;
 		pWrapperTable->m_SignalHandler_SetStringResult = nullptr;
+		pWrapperTable->m_SignalHandler_SetUUIDResult = nullptr;
 		pWrapperTable->m_SignalHandler_SetDoubleResult = nullptr;
 		pWrapperTable->m_SignalHandler_SetIntegerResult = nullptr;
 		pWrapperTable->m_SignalHandler_SetBoolResult = nullptr;
-		pWrapperTable->m_StateEnvironment_CreateSignal = nullptr;
+		pWrapperTable->m_StateEnvironment_PrepareSignal = nullptr;
 		pWrapperTable->m_StateEnvironment_WaitForSignal = nullptr;
 		pWrapperTable->m_StateEnvironment_GetDriverLibrary = nullptr;
 		pWrapperTable->m_StateEnvironment_CreateDriverAccess = nullptr;
-		pWrapperTable->m_StateEnvironment_LoadToolpath = nullptr;
-		pWrapperTable->m_StateEnvironment_UnloadToolpath = nullptr;
+		pWrapperTable->m_StateEnvironment_GetBuildJob = nullptr;
 		pWrapperTable->m_StateEnvironment_UnloadAllToolpathes = nullptr;
-		pWrapperTable->m_StateEnvironment_CreateToolpathAccessor = nullptr;
-		pWrapperTable->m_StateEnvironment_ToolpathIsLoaded = nullptr;
 		pWrapperTable->m_StateEnvironment_SetNextState = nullptr;
 		pWrapperTable->m_StateEnvironment_LogMessage = nullptr;
 		pWrapperTable->m_StateEnvironment_LogWarning = nullptr;
@@ -614,21 +671,25 @@ class CStateEnvironment : public CBase {
 		pWrapperTable->m_StateEnvironment_Sleep = nullptr;
 		pWrapperTable->m_StateEnvironment_CheckForTermination = nullptr;
 		pWrapperTable->m_StateEnvironment_StoreString = nullptr;
+		pWrapperTable->m_StateEnvironment_StoreUUID = nullptr;
 		pWrapperTable->m_StateEnvironment_StoreInteger = nullptr;
 		pWrapperTable->m_StateEnvironment_StoreDouble = nullptr;
 		pWrapperTable->m_StateEnvironment_StoreBool = nullptr;
 		pWrapperTable->m_StateEnvironment_StoreSignal = nullptr;
 		pWrapperTable->m_StateEnvironment_RetrieveString = nullptr;
+		pWrapperTable->m_StateEnvironment_RetrieveUUID = nullptr;
 		pWrapperTable->m_StateEnvironment_RetrieveInteger = nullptr;
 		pWrapperTable->m_StateEnvironment_RetrieveDouble = nullptr;
 		pWrapperTable->m_StateEnvironment_RetrieveBool = nullptr;
 		pWrapperTable->m_StateEnvironment_RetrieveSignal = nullptr;
 		pWrapperTable->m_StateEnvironment_ClearStoredValue = nullptr;
 		pWrapperTable->m_StateEnvironment_SetStringParameter = nullptr;
+		pWrapperTable->m_StateEnvironment_SetUUIDParameter = nullptr;
 		pWrapperTable->m_StateEnvironment_SetDoubleParameter = nullptr;
 		pWrapperTable->m_StateEnvironment_SetIntegerParameter = nullptr;
 		pWrapperTable->m_StateEnvironment_SetBoolParameter = nullptr;
 		pWrapperTable->m_StateEnvironment_GetStringParameter = nullptr;
+		pWrapperTable->m_StateEnvironment_GetUUIDParameter = nullptr;
 		pWrapperTable->m_StateEnvironment_GetDoubleParameter = nullptr;
 		pWrapperTable->m_StateEnvironment_GetIntegerParameter = nullptr;
 		pWrapperTable->m_StateEnvironment_GetBoolParameter = nullptr;
@@ -721,6 +782,24 @@ class CStateEnvironment : public CBase {
 		if (pWrapperTable->m_ToolpathLayer_GetSegmentProfileUUID == nullptr)
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_ToolpathLayer_GetSegmentProfileValue = (PLibMCEnvToolpathLayer_GetSegmentProfileValuePtr) GetProcAddress(hLibrary, "libmcenv_toolpathlayer_getsegmentprofilevalue");
+		#else // _WIN32
+		pWrapperTable->m_ToolpathLayer_GetSegmentProfileValue = (PLibMCEnvToolpathLayer_GetSegmentProfileValuePtr) dlsym(hLibrary, "libmcenv_toolpathlayer_getsegmentprofilevalue");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_ToolpathLayer_GetSegmentProfileValue == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_ToolpathLayer_GetSegmentProfileTypedValue = (PLibMCEnvToolpathLayer_GetSegmentProfileTypedValuePtr) GetProcAddress(hLibrary, "libmcenv_toolpathlayer_getsegmentprofiletypedvalue");
+		#else // _WIN32
+		pWrapperTable->m_ToolpathLayer_GetSegmentProfileTypedValue = (PLibMCEnvToolpathLayer_GetSegmentProfileTypedValuePtr) dlsym(hLibrary, "libmcenv_toolpathlayer_getsegmentprofiletypedvalue");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_ToolpathLayer_GetSegmentProfileTypedValue == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_ToolpathLayer_GetSegmentPartUUID = (PLibMCEnvToolpathLayer_GetSegmentPartUUIDPtr) GetProcAddress(hLibrary, "libmcenv_toolpathlayer_getsegmentpartuuid");
 		#else // _WIN32
@@ -740,12 +819,30 @@ class CStateEnvironment : public CBase {
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		#ifdef _WIN32
-		pWrapperTable->m_ToolpathAccessor_GetUUID = (PLibMCEnvToolpathAccessor_GetUUIDPtr) GetProcAddress(hLibrary, "libmcenv_toolpathaccessor_getuuid");
+		pWrapperTable->m_ToolpathLayer_GetZValue = (PLibMCEnvToolpathLayer_GetZValuePtr) GetProcAddress(hLibrary, "libmcenv_toolpathlayer_getzvalue");
 		#else // _WIN32
-		pWrapperTable->m_ToolpathAccessor_GetUUID = (PLibMCEnvToolpathAccessor_GetUUIDPtr) dlsym(hLibrary, "libmcenv_toolpathaccessor_getuuid");
+		pWrapperTable->m_ToolpathLayer_GetZValue = (PLibMCEnvToolpathLayer_GetZValuePtr) dlsym(hLibrary, "libmcenv_toolpathlayer_getzvalue");
 		dlerror();
 		#endif // _WIN32
-		if (pWrapperTable->m_ToolpathAccessor_GetUUID == nullptr)
+		if (pWrapperTable->m_ToolpathLayer_GetZValue == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_ToolpathLayer_GetUnits = (PLibMCEnvToolpathLayer_GetUnitsPtr) GetProcAddress(hLibrary, "libmcenv_toolpathlayer_getunits");
+		#else // _WIN32
+		pWrapperTable->m_ToolpathLayer_GetUnits = (PLibMCEnvToolpathLayer_GetUnitsPtr) dlsym(hLibrary, "libmcenv_toolpathlayer_getunits");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_ToolpathLayer_GetUnits == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_ToolpathAccessor_GetStorageUUID = (PLibMCEnvToolpathAccessor_GetStorageUUIDPtr) GetProcAddress(hLibrary, "libmcenv_toolpathaccessor_getstorageuuid");
+		#else // _WIN32
+		pWrapperTable->m_ToolpathAccessor_GetStorageUUID = (PLibMCEnvToolpathAccessor_GetStorageUUIDPtr) dlsym(hLibrary, "libmcenv_toolpathaccessor_getstorageuuid");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_ToolpathAccessor_GetStorageUUID == nullptr)
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		#ifdef _WIN32
@@ -766,6 +863,105 @@ class CStateEnvironment : public CBase {
 		if (pWrapperTable->m_ToolpathAccessor_LoadLayer == nullptr)
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_ToolpathAccessor_GetUnits = (PLibMCEnvToolpathAccessor_GetUnitsPtr) GetProcAddress(hLibrary, "libmcenv_toolpathaccessor_getunits");
+		#else // _WIN32
+		pWrapperTable->m_ToolpathAccessor_GetUnits = (PLibMCEnvToolpathAccessor_GetUnitsPtr) dlsym(hLibrary, "libmcenv_toolpathaccessor_getunits");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_ToolpathAccessor_GetUnits == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Build_GetName = (PLibMCEnvBuild_GetNamePtr) GetProcAddress(hLibrary, "libmcenv_build_getname");
+		#else // _WIN32
+		pWrapperTable->m_Build_GetName = (PLibMCEnvBuild_GetNamePtr) dlsym(hLibrary, "libmcenv_build_getname");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Build_GetName == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Build_GetBuildUUID = (PLibMCEnvBuild_GetBuildUUIDPtr) GetProcAddress(hLibrary, "libmcenv_build_getbuilduuid");
+		#else // _WIN32
+		pWrapperTable->m_Build_GetBuildUUID = (PLibMCEnvBuild_GetBuildUUIDPtr) dlsym(hLibrary, "libmcenv_build_getbuilduuid");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Build_GetBuildUUID == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Build_GetStorageUUID = (PLibMCEnvBuild_GetStorageUUIDPtr) GetProcAddress(hLibrary, "libmcenv_build_getstorageuuid");
+		#else // _WIN32
+		pWrapperTable->m_Build_GetStorageUUID = (PLibMCEnvBuild_GetStorageUUIDPtr) dlsym(hLibrary, "libmcenv_build_getstorageuuid");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Build_GetStorageUUID == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Build_GetStorageSHA256 = (PLibMCEnvBuild_GetStorageSHA256Ptr) GetProcAddress(hLibrary, "libmcenv_build_getstoragesha256");
+		#else // _WIN32
+		pWrapperTable->m_Build_GetStorageSHA256 = (PLibMCEnvBuild_GetStorageSHA256Ptr) dlsym(hLibrary, "libmcenv_build_getstoragesha256");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Build_GetStorageSHA256 == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Build_GetLayerCount = (PLibMCEnvBuild_GetLayerCountPtr) GetProcAddress(hLibrary, "libmcenv_build_getlayercount");
+		#else // _WIN32
+		pWrapperTable->m_Build_GetLayerCount = (PLibMCEnvBuild_GetLayerCountPtr) dlsym(hLibrary, "libmcenv_build_getlayercount");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Build_GetLayerCount == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Build_LoadToolpath = (PLibMCEnvBuild_LoadToolpathPtr) GetProcAddress(hLibrary, "libmcenv_build_loadtoolpath");
+		#else // _WIN32
+		pWrapperTable->m_Build_LoadToolpath = (PLibMCEnvBuild_LoadToolpathPtr) dlsym(hLibrary, "libmcenv_build_loadtoolpath");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Build_LoadToolpath == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Build_UnloadToolpath = (PLibMCEnvBuild_UnloadToolpathPtr) GetProcAddress(hLibrary, "libmcenv_build_unloadtoolpath");
+		#else // _WIN32
+		pWrapperTable->m_Build_UnloadToolpath = (PLibMCEnvBuild_UnloadToolpathPtr) dlsym(hLibrary, "libmcenv_build_unloadtoolpath");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Build_UnloadToolpath == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Build_ToolpathIsLoaded = (PLibMCEnvBuild_ToolpathIsLoadedPtr) GetProcAddress(hLibrary, "libmcenv_build_toolpathisloaded");
+		#else // _WIN32
+		pWrapperTable->m_Build_ToolpathIsLoaded = (PLibMCEnvBuild_ToolpathIsLoadedPtr) dlsym(hLibrary, "libmcenv_build_toolpathisloaded");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Build_ToolpathIsLoaded == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Build_CreateToolpathAccessor = (PLibMCEnvBuild_CreateToolpathAccessorPtr) GetProcAddress(hLibrary, "libmcenv_build_createtoolpathaccessor");
+		#else // _WIN32
+		pWrapperTable->m_Build_CreateToolpathAccessor = (PLibMCEnvBuild_CreateToolpathAccessorPtr) dlsym(hLibrary, "libmcenv_build_createtoolpathaccessor");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Build_CreateToolpathAccessor == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		#ifdef _WIN32
+		pWrapperTable->m_Build_AddBinaryData = (PLibMCEnvBuild_AddBinaryDataPtr) GetProcAddress(hLibrary, "libmcenv_build_addbinarydata");
+		#else // _WIN32
+		pWrapperTable->m_Build_AddBinaryData = (PLibMCEnvBuild_AddBinaryDataPtr) dlsym(hLibrary, "libmcenv_build_addbinarydata");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_Build_AddBinaryData == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_SignalTrigger_CanTrigger = (PLibMCEnvSignalTrigger_CanTriggerPtr) GetProcAddress(hLibrary, "libmcenv_signaltrigger_cantrigger");
 		#else // _WIN32
@@ -820,6 +1016,15 @@ class CStateEnvironment : public CBase {
 		if (pWrapperTable->m_SignalTrigger_SetString == nullptr)
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_SignalTrigger_SetUUID = (PLibMCEnvSignalTrigger_SetUUIDPtr) GetProcAddress(hLibrary, "libmcenv_signaltrigger_setuuid");
+		#else // _WIN32
+		pWrapperTable->m_SignalTrigger_SetUUID = (PLibMCEnvSignalTrigger_SetUUIDPtr) dlsym(hLibrary, "libmcenv_signaltrigger_setuuid");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_SignalTrigger_SetUUID == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_SignalTrigger_SetDouble = (PLibMCEnvSignalTrigger_SetDoublePtr) GetProcAddress(hLibrary, "libmcenv_signaltrigger_setdouble");
 		#else // _WIN32
@@ -856,6 +1061,15 @@ class CStateEnvironment : public CBase {
 		if (pWrapperTable->m_SignalTrigger_GetStringResult == nullptr)
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_SignalTrigger_GetUUIDResult = (PLibMCEnvSignalTrigger_GetUUIDResultPtr) GetProcAddress(hLibrary, "libmcenv_signaltrigger_getuuidresult");
+		#else // _WIN32
+		pWrapperTable->m_SignalTrigger_GetUUIDResult = (PLibMCEnvSignalTrigger_GetUUIDResultPtr) dlsym(hLibrary, "libmcenv_signaltrigger_getuuidresult");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_SignalTrigger_GetUUIDResult == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_SignalTrigger_GetDoubleResult = (PLibMCEnvSignalTrigger_GetDoubleResultPtr) GetProcAddress(hLibrary, "libmcenv_signaltrigger_getdoubleresult");
 		#else // _WIN32
@@ -928,6 +1142,15 @@ class CStateEnvironment : public CBase {
 		if (pWrapperTable->m_SignalHandler_GetString == nullptr)
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_SignalHandler_GetUUID = (PLibMCEnvSignalHandler_GetUUIDPtr) GetProcAddress(hLibrary, "libmcenv_signalhandler_getuuid");
+		#else // _WIN32
+		pWrapperTable->m_SignalHandler_GetUUID = (PLibMCEnvSignalHandler_GetUUIDPtr) dlsym(hLibrary, "libmcenv_signalhandler_getuuid");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_SignalHandler_GetUUID == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_SignalHandler_GetDouble = (PLibMCEnvSignalHandler_GetDoublePtr) GetProcAddress(hLibrary, "libmcenv_signalhandler_getdouble");
 		#else // _WIN32
@@ -964,6 +1187,15 @@ class CStateEnvironment : public CBase {
 		if (pWrapperTable->m_SignalHandler_SetStringResult == nullptr)
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_SignalHandler_SetUUIDResult = (PLibMCEnvSignalHandler_SetUUIDResultPtr) GetProcAddress(hLibrary, "libmcenv_signalhandler_setuuidresult");
+		#else // _WIN32
+		pWrapperTable->m_SignalHandler_SetUUIDResult = (PLibMCEnvSignalHandler_SetUUIDResultPtr) dlsym(hLibrary, "libmcenv_signalhandler_setuuidresult");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_SignalHandler_SetUUIDResult == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_SignalHandler_SetDoubleResult = (PLibMCEnvSignalHandler_SetDoubleResultPtr) GetProcAddress(hLibrary, "libmcenv_signalhandler_setdoubleresult");
 		#else // _WIN32
@@ -992,12 +1224,12 @@ class CStateEnvironment : public CBase {
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		#ifdef _WIN32
-		pWrapperTable->m_StateEnvironment_CreateSignal = (PLibMCEnvStateEnvironment_CreateSignalPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_createsignal");
+		pWrapperTable->m_StateEnvironment_PrepareSignal = (PLibMCEnvStateEnvironment_PrepareSignalPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_preparesignal");
 		#else // _WIN32
-		pWrapperTable->m_StateEnvironment_CreateSignal = (PLibMCEnvStateEnvironment_CreateSignalPtr) dlsym(hLibrary, "libmcenv_stateenvironment_createsignal");
+		pWrapperTable->m_StateEnvironment_PrepareSignal = (PLibMCEnvStateEnvironment_PrepareSignalPtr) dlsym(hLibrary, "libmcenv_stateenvironment_preparesignal");
 		dlerror();
 		#endif // _WIN32
-		if (pWrapperTable->m_StateEnvironment_CreateSignal == nullptr)
+		if (pWrapperTable->m_StateEnvironment_PrepareSignal == nullptr)
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		#ifdef _WIN32
@@ -1028,21 +1260,12 @@ class CStateEnvironment : public CBase {
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		#ifdef _WIN32
-		pWrapperTable->m_StateEnvironment_LoadToolpath = (PLibMCEnvStateEnvironment_LoadToolpathPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_loadtoolpath");
-		#else // _WIN32
-		pWrapperTable->m_StateEnvironment_LoadToolpath = (PLibMCEnvStateEnvironment_LoadToolpathPtr) dlsym(hLibrary, "libmcenv_stateenvironment_loadtoolpath");
-		dlerror();
-		#endif // _WIN32
-		if (pWrapperTable->m_StateEnvironment_LoadToolpath == nullptr)
-			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
-		
-		#ifdef _WIN32
-		pWrapperTable->m_StateEnvironment_UnloadToolpath = (PLibMCEnvStateEnvironment_UnloadToolpathPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_unloadtoolpath");
+		pWrapperTable->m_StateEnvironment_GetBuildJob = (PLibMCEnvStateEnvironment_GetBuildJobPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_getbuildjob");
 		#else // _WIN32
-		pWrapperTable->m_StateEnvironment_UnloadToolpath = (PLibMCEnvStateEnvironment_UnloadToolpathPtr) dlsym(hLibrary, "libmcenv_stateenvironment_unloadtoolpath");
+		pWrapperTable->m_StateEnvironment_GetBuildJob = (PLibMCEnvStateEnvironment_GetBuildJobPtr) dlsym(hLibrary, "libmcenv_stateenvironment_getbuildjob");
 		dlerror();
 		#endif // _WIN32
-		if (pWrapperTable->m_StateEnvironment_UnloadToolpath == nullptr)
+		if (pWrapperTable->m_StateEnvironment_GetBuildJob == nullptr)
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		#ifdef _WIN32
@@ -1054,24 +1277,6 @@ class CStateEnvironment : public CBase {
 		if (pWrapperTable->m_StateEnvironment_UnloadAllToolpathes == nullptr)
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
-		#ifdef _WIN32
-		pWrapperTable->m_StateEnvironment_CreateToolpathAccessor = (PLibMCEnvStateEnvironment_CreateToolpathAccessorPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_createtoolpathaccessor");
-		#else // _WIN32
-		pWrapperTable->m_StateEnvironment_CreateToolpathAccessor = (PLibMCEnvStateEnvironment_CreateToolpathAccessorPtr) dlsym(hLibrary, "libmcenv_stateenvironment_createtoolpathaccessor");
-		dlerror();
-		#endif // _WIN32
-		if (pWrapperTable->m_StateEnvironment_CreateToolpathAccessor == nullptr)
-			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
-		
-		#ifdef _WIN32
-		pWrapperTable->m_StateEnvironment_ToolpathIsLoaded = (PLibMCEnvStateEnvironment_ToolpathIsLoadedPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_toolpathisloaded");
-		#else // _WIN32
-		pWrapperTable->m_StateEnvironment_ToolpathIsLoaded = (PLibMCEnvStateEnvironment_ToolpathIsLoadedPtr) dlsym(hLibrary, "libmcenv_stateenvironment_toolpathisloaded");
-		dlerror();
-		#endif // _WIN32
-		if (pWrapperTable->m_StateEnvironment_ToolpathIsLoaded == nullptr)
-			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
-		
 		#ifdef _WIN32
 		pWrapperTable->m_StateEnvironment_SetNextState = (PLibMCEnvStateEnvironment_SetNextStatePtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_setnextstate");
 		#else // _WIN32
@@ -1135,6 +1340,15 @@ class CStateEnvironment : public CBase {
 		if (pWrapperTable->m_StateEnvironment_StoreString == nullptr)
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_StateEnvironment_StoreUUID = (PLibMCEnvStateEnvironment_StoreUUIDPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_storeuuid");
+		#else // _WIN32
+		pWrapperTable->m_StateEnvironment_StoreUUID = (PLibMCEnvStateEnvironment_StoreUUIDPtr) dlsym(hLibrary, "libmcenv_stateenvironment_storeuuid");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_StateEnvironment_StoreUUID == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_StateEnvironment_StoreInteger = (PLibMCEnvStateEnvironment_StoreIntegerPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_storeinteger");
 		#else // _WIN32
@@ -1180,6 +1394,15 @@ class CStateEnvironment : public CBase {
 		if (pWrapperTable->m_StateEnvironment_RetrieveString == nullptr)
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_StateEnvironment_RetrieveUUID = (PLibMCEnvStateEnvironment_RetrieveUUIDPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_retrieveuuid");
+		#else // _WIN32
+		pWrapperTable->m_StateEnvironment_RetrieveUUID = (PLibMCEnvStateEnvironment_RetrieveUUIDPtr) dlsym(hLibrary, "libmcenv_stateenvironment_retrieveuuid");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_StateEnvironment_RetrieveUUID == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_StateEnvironment_RetrieveInteger = (PLibMCEnvStateEnvironment_RetrieveIntegerPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_retrieveinteger");
 		#else // _WIN32
@@ -1234,6 +1457,15 @@ class CStateEnvironment : public CBase {
 		if (pWrapperTable->m_StateEnvironment_SetStringParameter == nullptr)
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_StateEnvironment_SetUUIDParameter = (PLibMCEnvStateEnvironment_SetUUIDParameterPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_setuuidparameter");
+		#else // _WIN32
+		pWrapperTable->m_StateEnvironment_SetUUIDParameter = (PLibMCEnvStateEnvironment_SetUUIDParameterPtr) dlsym(hLibrary, "libmcenv_stateenvironment_setuuidparameter");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_StateEnvironment_SetUUIDParameter == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_StateEnvironment_SetDoubleParameter = (PLibMCEnvStateEnvironment_SetDoubleParameterPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_setdoubleparameter");
 		#else // _WIN32
@@ -1270,6 +1502,15 @@ class CStateEnvironment : public CBase {
 		if (pWrapperTable->m_StateEnvironment_GetStringParameter == nullptr)
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		#ifdef _WIN32
+		pWrapperTable->m_StateEnvironment_GetUUIDParameter = (PLibMCEnvStateEnvironment_GetUUIDParameterPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_getuuidparameter");
+		#else // _WIN32
+		pWrapperTable->m_StateEnvironment_GetUUIDParameter = (PLibMCEnvStateEnvironment_GetUUIDParameterPtr) dlsym(hLibrary, "libmcenv_stateenvironment_getuuidparameter");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_StateEnvironment_GetUUIDParameter == nullptr)
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		#ifdef _WIN32
 		pWrapperTable->m_StateEnvironment_GetDoubleParameter = (PLibMCEnvStateEnvironment_GetDoubleParameterPtr) GetProcAddress(hLibrary, "libmcenv_stateenvironment_getdoubleparameter");
 		#else // _WIN32
@@ -1374,6 +1615,14 @@ class CStateEnvironment : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_ToolpathLayer_GetSegmentProfileUUID == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcenv_toolpathlayer_getsegmentprofilevalue", (void**)&(pWrapperTable->m_ToolpathLayer_GetSegmentProfileValue));
+		if ( (eLookupError != 0) || (pWrapperTable->m_ToolpathLayer_GetSegmentProfileValue == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcenv_toolpathlayer_getsegmentprofiletypedvalue", (void**)&(pWrapperTable->m_ToolpathLayer_GetSegmentProfileTypedValue));
+		if ( (eLookupError != 0) || (pWrapperTable->m_ToolpathLayer_GetSegmentProfileTypedValue == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcenv_toolpathlayer_getsegmentpartuuid", (void**)&(pWrapperTable->m_ToolpathLayer_GetSegmentPartUUID));
 		if ( (eLookupError != 0) || (pWrapperTable->m_ToolpathLayer_GetSegmentPartUUID == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1382,8 +1631,16 @@ class CStateEnvironment : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_ToolpathLayer_GetSegmentPointData == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
-		eLookupError = (*pLookup)("libmcenv_toolpathaccessor_getuuid", (void**)&(pWrapperTable->m_ToolpathAccessor_GetUUID));
-		if ( (eLookupError != 0) || (pWrapperTable->m_ToolpathAccessor_GetUUID == nullptr) )
+		eLookupError = (*pLookup)("libmcenv_toolpathlayer_getzvalue", (void**)&(pWrapperTable->m_ToolpathLayer_GetZValue));
+		if ( (eLookupError != 0) || (pWrapperTable->m_ToolpathLayer_GetZValue == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcenv_toolpathlayer_getunits", (void**)&(pWrapperTable->m_ToolpathLayer_GetUnits));
+		if ( (eLookupError != 0) || (pWrapperTable->m_ToolpathLayer_GetUnits == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcenv_toolpathaccessor_getstorageuuid", (void**)&(pWrapperTable->m_ToolpathAccessor_GetStorageUUID));
+		if ( (eLookupError != 0) || (pWrapperTable->m_ToolpathAccessor_GetStorageUUID == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		eLookupError = (*pLookup)("libmcenv_toolpathaccessor_getlayercount", (void**)&(pWrapperTable->m_ToolpathAccessor_GetLayerCount));
@@ -1394,6 +1651,50 @@ class CStateEnvironment : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_ToolpathAccessor_LoadLayer == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcenv_toolpathaccessor_getunits", (void**)&(pWrapperTable->m_ToolpathAccessor_GetUnits));
+		if ( (eLookupError != 0) || (pWrapperTable->m_ToolpathAccessor_GetUnits == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcenv_build_getname", (void**)&(pWrapperTable->m_Build_GetName));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Build_GetName == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcenv_build_getbuilduuid", (void**)&(pWrapperTable->m_Build_GetBuildUUID));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Build_GetBuildUUID == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcenv_build_getstorageuuid", (void**)&(pWrapperTable->m_Build_GetStorageUUID));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Build_GetStorageUUID == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcenv_build_getstoragesha256", (void**)&(pWrapperTable->m_Build_GetStorageSHA256));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Build_GetStorageSHA256 == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcenv_build_getlayercount", (void**)&(pWrapperTable->m_Build_GetLayerCount));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Build_GetLayerCount == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcenv_build_loadtoolpath", (void**)&(pWrapperTable->m_Build_LoadToolpath));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Build_LoadToolpath == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcenv_build_unloadtoolpath", (void**)&(pWrapperTable->m_Build_UnloadToolpath));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Build_UnloadToolpath == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcenv_build_toolpathisloaded", (void**)&(pWrapperTable->m_Build_ToolpathIsLoaded));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Build_ToolpathIsLoaded == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcenv_build_createtoolpathaccessor", (void**)&(pWrapperTable->m_Build_CreateToolpathAccessor));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Build_CreateToolpathAccessor == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
+		eLookupError = (*pLookup)("libmcenv_build_addbinarydata", (void**)&(pWrapperTable->m_Build_AddBinaryData));
+		if ( (eLookupError != 0) || (pWrapperTable->m_Build_AddBinaryData == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcenv_signaltrigger_cantrigger", (void**)&(pWrapperTable->m_SignalTrigger_CanTrigger));
 		if ( (eLookupError != 0) || (pWrapperTable->m_SignalTrigger_CanTrigger == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1418,6 +1719,10 @@ class CStateEnvironment : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_SignalTrigger_SetString == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcenv_signaltrigger_setuuid", (void**)&(pWrapperTable->m_SignalTrigger_SetUUID));
+		if ( (eLookupError != 0) || (pWrapperTable->m_SignalTrigger_SetUUID == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcenv_signaltrigger_setdouble", (void**)&(pWrapperTable->m_SignalTrigger_SetDouble));
 		if ( (eLookupError != 0) || (pWrapperTable->m_SignalTrigger_SetDouble == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1434,6 +1739,10 @@ class CStateEnvironment : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_SignalTrigger_GetStringResult == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcenv_signaltrigger_getuuidresult", (void**)&(pWrapperTable->m_SignalTrigger_GetUUIDResult));
+		if ( (eLookupError != 0) || (pWrapperTable->m_SignalTrigger_GetUUIDResult == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcenv_signaltrigger_getdoubleresult", (void**)&(pWrapperTable->m_SignalTrigger_GetDoubleResult));
 		if ( (eLookupError != 0) || (pWrapperTable->m_SignalTrigger_GetDoubleResult == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1466,6 +1775,10 @@ class CStateEnvironment : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_SignalHandler_GetString == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcenv_signalhandler_getuuid", (void**)&(pWrapperTable->m_SignalHandler_GetUUID));
+		if ( (eLookupError != 0) || (pWrapperTable->m_SignalHandler_GetUUID == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcenv_signalhandler_getdouble", (void**)&(pWrapperTable->m_SignalHandler_GetDouble));
 		if ( (eLookupError != 0) || (pWrapperTable->m_SignalHandler_GetDouble == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1482,6 +1795,10 @@ class CStateEnvironment : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_SignalHandler_SetStringResult == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcenv_signalhandler_setuuidresult", (void**)&(pWrapperTable->m_SignalHandler_SetUUIDResult));
+		if ( (eLookupError != 0) || (pWrapperTable->m_SignalHandler_SetUUIDResult == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcenv_signalhandler_setdoubleresult", (void**)&(pWrapperTable->m_SignalHandler_SetDoubleResult));
 		if ( (eLookupError != 0) || (pWrapperTable->m_SignalHandler_SetDoubleResult == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1494,8 +1811,8 @@ class CStateEnvironment : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_SignalHandler_SetBoolResult == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
-		eLookupError = (*pLookup)("libmcenv_stateenvironment_createsignal", (void**)&(pWrapperTable->m_StateEnvironment_CreateSignal));
-		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_CreateSignal == nullptr) )
+		eLookupError = (*pLookup)("libmcenv_stateenvironment_preparesignal", (void**)&(pWrapperTable->m_StateEnvironment_PrepareSignal));
+		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_PrepareSignal == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		eLookupError = (*pLookup)("libmcenv_stateenvironment_waitforsignal", (void**)&(pWrapperTable->m_StateEnvironment_WaitForSignal));
@@ -1510,26 +1827,14 @@ class CStateEnvironment : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_CreateDriverAccess == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
-		eLookupError = (*pLookup)("libmcenv_stateenvironment_loadtoolpath", (void**)&(pWrapperTable->m_StateEnvironment_LoadToolpath));
-		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_LoadToolpath == nullptr) )
-			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
-		
-		eLookupError = (*pLookup)("libmcenv_stateenvironment_unloadtoolpath", (void**)&(pWrapperTable->m_StateEnvironment_UnloadToolpath));
-		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_UnloadToolpath == nullptr) )
+		eLookupError = (*pLookup)("libmcenv_stateenvironment_getbuildjob", (void**)&(pWrapperTable->m_StateEnvironment_GetBuildJob));
+		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_GetBuildJob == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
 		eLookupError = (*pLookup)("libmcenv_stateenvironment_unloadalltoolpathes", (void**)&(pWrapperTable->m_StateEnvironment_UnloadAllToolpathes));
 		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_UnloadAllToolpathes == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
-		eLookupError = (*pLookup)("libmcenv_stateenvironment_createtoolpathaccessor", (void**)&(pWrapperTable->m_StateEnvironment_CreateToolpathAccessor));
-		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_CreateToolpathAccessor == nullptr) )
-			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
-		
-		eLookupError = (*pLookup)("libmcenv_stateenvironment_toolpathisloaded", (void**)&(pWrapperTable->m_StateEnvironment_ToolpathIsLoaded));
-		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_ToolpathIsLoaded == nullptr) )
-			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
-		
 		eLookupError = (*pLookup)("libmcenv_stateenvironment_setnextstate", (void**)&(pWrapperTable->m_StateEnvironment_SetNextState));
 		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_SetNextState == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1558,6 +1863,10 @@ class CStateEnvironment : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_StoreString == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcenv_stateenvironment_storeuuid", (void**)&(pWrapperTable->m_StateEnvironment_StoreUUID));
+		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_StoreUUID == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcenv_stateenvironment_storeinteger", (void**)&(pWrapperTable->m_StateEnvironment_StoreInteger));
 		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_StoreInteger == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1578,6 +1887,10 @@ class CStateEnvironment : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_RetrieveString == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcenv_stateenvironment_retrieveuuid", (void**)&(pWrapperTable->m_StateEnvironment_RetrieveUUID));
+		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_RetrieveUUID == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcenv_stateenvironment_retrieveinteger", (void**)&(pWrapperTable->m_StateEnvironment_RetrieveInteger));
 		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_RetrieveInteger == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1602,6 +1915,10 @@ class CStateEnvironment : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_SetStringParameter == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcenv_stateenvironment_setuuidparameter", (void**)&(pWrapperTable->m_StateEnvironment_SetUUIDParameter));
+		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_SetUUIDParameter == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcenv_stateenvironment_setdoubleparameter", (void**)&(pWrapperTable->m_StateEnvironment_SetDoubleParameter));
 		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_SetDoubleParameter == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1618,6 +1935,10 @@ class CStateEnvironment : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_GetStringParameter == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
 		
+		eLookupError = (*pLookup)("libmcenv_stateenvironment_getuuidparameter", (void**)&(pWrapperTable->m_StateEnvironment_GetUUIDParameter));
+		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_GetUUIDParameter == nullptr) )
+			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
+		
 		eLookupError = (*pLookup)("libmcenv_stateenvironment_getdoubleparameter", (void**)&(pWrapperTable->m_StateEnvironment_GetDoubleParameter));
 		if ( (eLookupError != 0) || (pWrapperTable->m_StateEnvironment_GetDoubleParameter == nullptr) )
 			return LIBMCENV_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -1717,6 +2038,35 @@ class CStateEnvironment : public CBase {
 		return std::string(&bufferProfileUUID[0]);
 	}
 	
+	/**
+	* CToolpathLayer::GetSegmentProfileValue - Retrieves an assigned profile custom value.
+	* @param[in] sValueName - Value Name to query for.
+	* @return String Value.
+	*/
+	std::string CToolpathLayer::GetSegmentProfileValue(const std::string & sValueName)
+	{
+		LibMCEnv_uint32 bytesNeededValue = 0;
+		LibMCEnv_uint32 bytesWrittenValue = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_ToolpathLayer_GetSegmentProfileValue(m_pHandle, sValueName.c_str(), 0, &bytesNeededValue, nullptr));
+		std::vector<char> bufferValue(bytesNeededValue);
+		CheckError(m_pWrapper->m_WrapperTable.m_ToolpathLayer_GetSegmentProfileValue(m_pHandle, sValueName.c_str(), bytesNeededValue, &bytesWrittenValue, &bufferValue[0]));
+		
+		return std::string(&bufferValue[0]);
+	}
+	
+	/**
+	* CToolpathLayer::GetSegmentProfileTypedValue - Retrieves an assigned profile value of a standard type.
+	* @param[in] eValueType - Enum to query for. MUST NOT be custom.
+	* @return Double Value
+	*/
+	LibMCEnv_double CToolpathLayer::GetSegmentProfileTypedValue(const eToolpathProfileValueType eValueType)
+	{
+		LibMCEnv_double resultValue = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_ToolpathLayer_GetSegmentProfileTypedValue(m_pHandle, eValueType, &resultValue));
+		
+		return resultValue;
+	}
+	
 	/**
 	* CToolpathLayer::GetSegmentPartUUID - Retrieves the assigned segment part uuid.
 	* @param[in] nIndex - Index. Must be between 0 and Count - 1.
@@ -1736,7 +2086,7 @@ class CStateEnvironment : public CBase {
 	/**
 	* CToolpathLayer::GetSegmentPointData - Retrieves the assigned segment point list. For type hatch, the points are taken pairwise.
 	* @param[in] nIndex - Index. Must be between 0 and Count - 1.
-	* @param[out] PointDataBuffer - The point data array
+	* @param[out] PointDataBuffer - The point data array. Positions are absolute in units.
 	*/
 	void CToolpathLayer::GetSegmentPointData(const LibMCEnv_uint32 nIndex, std::vector<sPosition2D> & PointDataBuffer)
 	{
@@ -1747,23 +2097,47 @@ class CStateEnvironment : public CBase {
 		CheckError(m_pWrapper->m_WrapperTable.m_ToolpathLayer_GetSegmentPointData(m_pHandle, nIndex, elementsNeededPointData, &elementsWrittenPointData, PointDataBuffer.data()));
 	}
 	
+	/**
+	* CToolpathLayer::GetZValue - Retrieves the layers Z Value in units.
+	* @return Z Value of the layer in units.
+	*/
+	LibMCEnv_int32 CToolpathLayer::GetZValue()
+	{
+		LibMCEnv_int32 resultZValue = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_ToolpathLayer_GetZValue(m_pHandle, &resultZValue));
+		
+		return resultZValue;
+	}
+	
+	/**
+	* CToolpathLayer::GetUnits - Retrieves the toolpath units in mm.
+	* @return Toolpath units.
+	*/
+	LibMCEnv_double CToolpathLayer::GetUnits()
+	{
+		LibMCEnv_double resultUnits = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_ToolpathLayer_GetUnits(m_pHandle, &resultUnits));
+		
+		return resultUnits;
+	}
+	
 	/**
 	 * Method definitions for class CToolpathAccessor
 	 */
 	
 	/**
-	* CToolpathAccessor::GetUUID - Returns Toolpath data UUID.
-	* @return Returns toolpath data uuid.
+	* CToolpathAccessor::GetStorageUUID - Returns Toolpath storage UUID.
+	* @return Returns toolpath storage uuid.
 	*/
-	std::string CToolpathAccessor::GetUUID()
+	std::string CToolpathAccessor::GetStorageUUID()
 	{
-		LibMCEnv_uint32 bytesNeededUUID = 0;
-		LibMCEnv_uint32 bytesWrittenUUID = 0;
-		CheckError(m_pWrapper->m_WrapperTable.m_ToolpathAccessor_GetUUID(m_pHandle, 0, &bytesNeededUUID, nullptr));
-		std::vector<char> bufferUUID(bytesNeededUUID);
-		CheckError(m_pWrapper->m_WrapperTable.m_ToolpathAccessor_GetUUID(m_pHandle, bytesNeededUUID, &bytesWrittenUUID, &bufferUUID[0]));
+		LibMCEnv_uint32 bytesNeededStorageUUID = 0;
+		LibMCEnv_uint32 bytesWrittenStorageUUID = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_ToolpathAccessor_GetStorageUUID(m_pHandle, 0, &bytesNeededStorageUUID, nullptr));
+		std::vector<char> bufferStorageUUID(bytesNeededStorageUUID);
+		CheckError(m_pWrapper->m_WrapperTable.m_ToolpathAccessor_GetStorageUUID(m_pHandle, bytesNeededStorageUUID, &bytesWrittenStorageUUID, &bufferStorageUUID[0]));
 		
-		return std::string(&bufferUUID[0]);
+		return std::string(&bufferStorageUUID[0]);
 	}
 	
 	/**
@@ -1794,6 +2168,155 @@ class CStateEnvironment : public CBase {
 		return std::make_shared<CToolpathLayer>(m_pWrapper, hLayerData);
 	}
 	
+	/**
+	* CToolpathAccessor::GetUnits - Retrieves the toolpath units in mm.
+	* @return Toolpath units.
+	*/
+	LibMCEnv_double CToolpathAccessor::GetUnits()
+	{
+		LibMCEnv_double resultUnits = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_ToolpathAccessor_GetUnits(m_pHandle, &resultUnits));
+		
+		return resultUnits;
+	}
+	
+	/**
+	 * Method definitions for class CBuild
+	 */
+	
+	/**
+	* CBuild::GetName - Returns name of the build.
+	* @return Name of the build.
+	*/
+	std::string CBuild::GetName()
+	{
+		LibMCEnv_uint32 bytesNeededName = 0;
+		LibMCEnv_uint32 bytesWrittenName = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_GetName(m_pHandle, 0, &bytesNeededName, nullptr));
+		std::vector<char> bufferName(bytesNeededName);
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_GetName(m_pHandle, bytesNeededName, &bytesWrittenName, &bufferName[0]));
+		
+		return std::string(&bufferName[0]);
+	}
+	
+	/**
+	* CBuild::GetBuildUUID - Returns uuid of the build.
+	* @return UUID of the build.
+	*/
+	std::string CBuild::GetBuildUUID()
+	{
+		LibMCEnv_uint32 bytesNeededBuildUUID = 0;
+		LibMCEnv_uint32 bytesWrittenBuildUUID = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_GetBuildUUID(m_pHandle, 0, &bytesNeededBuildUUID, nullptr));
+		std::vector<char> bufferBuildUUID(bytesNeededBuildUUID);
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_GetBuildUUID(m_pHandle, bytesNeededBuildUUID, &bytesWrittenBuildUUID, &bufferBuildUUID[0]));
+		
+		return std::string(&bufferBuildUUID[0]);
+	}
+	
+	/**
+	* CBuild::GetStorageUUID - Returns storage uuid of the build.
+	* @return Storage UUID of the build.
+	*/
+	std::string CBuild::GetStorageUUID()
+	{
+		LibMCEnv_uint32 bytesNeededStorageUUID = 0;
+		LibMCEnv_uint32 bytesWrittenStorageUUID = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_GetStorageUUID(m_pHandle, 0, &bytesNeededStorageUUID, nullptr));
+		std::vector<char> bufferStorageUUID(bytesNeededStorageUUID);
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_GetStorageUUID(m_pHandle, bytesNeededStorageUUID, &bytesWrittenStorageUUID, &bufferStorageUUID[0]));
+		
+		return std::string(&bufferStorageUUID[0]);
+	}
+	
+	/**
+	* CBuild::GetStorageSHA256 - Returns SHA256 of the build stream.
+	* @return SHA256 of the build stream.
+	*/
+	std::string CBuild::GetStorageSHA256()
+	{
+		LibMCEnv_uint32 bytesNeededSHA256 = 0;
+		LibMCEnv_uint32 bytesWrittenSHA256 = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_GetStorageSHA256(m_pHandle, 0, &bytesNeededSHA256, nullptr));
+		std::vector<char> bufferSHA256(bytesNeededSHA256);
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_GetStorageSHA256(m_pHandle, bytesNeededSHA256, &bytesWrittenSHA256, &bufferSHA256[0]));
+		
+		return std::string(&bufferSHA256[0]);
+	}
+	
+	/**
+	* CBuild::GetLayerCount - Returns cached layer count of the toolpath.
+	* @return Returns layer count.
+	*/
+	LibMCEnv_uint32 CBuild::GetLayerCount()
+	{
+		LibMCEnv_uint32 resultLayerCount = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_GetLayerCount(m_pHandle, &resultLayerCount));
+		
+		return resultLayerCount;
+	}
+	
+	/**
+	* CBuild::LoadToolpath - loads the a toolpath into memory
+	*/
+	void CBuild::LoadToolpath()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_LoadToolpath(m_pHandle));
+	}
+	
+	/**
+	* CBuild::UnloadToolpath - unloads the a toolpath from memory, if it has been loaded before.
+	*/
+	void CBuild::UnloadToolpath()
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_UnloadToolpath(m_pHandle));
+	}
+	
+	/**
+	* CBuild::ToolpathIsLoaded - checks, if a toolpath object is loaded to memory.
+	* @return returns if toolpath is loaded.
+	*/
+	bool CBuild::ToolpathIsLoaded()
+	{
+		bool resultIsLoaded = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_ToolpathIsLoaded(m_pHandle, &resultIsLoaded));
+		
+		return resultIsLoaded;
+	}
+	
+	/**
+	* CBuild::CreateToolpathAccessor - Creates an accessor object for a toolpath. Toolpath MUST have been loaded with LoadToolpath before.
+	* @return Toolpath instance.
+	*/
+	PToolpathAccessor CBuild::CreateToolpathAccessor()
+	{
+		LibMCEnvHandle hToolpathInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_CreateToolpathAccessor(m_pHandle, &hToolpathInstance));
+		
+		if (!hToolpathInstance) {
+			CheckError(LIBMCENV_ERROR_INVALIDPARAM);
+		}
+		return std::make_shared<CToolpathAccessor>(m_pWrapper, hToolpathInstance);
+	}
+	
+	/**
+	* CBuild::AddBinaryData - Adds binary data to store with the build.
+	* @param[in] sName - Name of the attache data block.
+	* @param[in] sMIMEType - Mime type of the data.
+	* @param[in] ContentBuffer - Stream content to store
+	* @return Data UUID of the attachment.
+	*/
+	std::string CBuild::AddBinaryData(const std::string & sName, const std::string & sMIMEType, const CInputVector<LibMCEnv_uint8> & ContentBuffer)
+	{
+		LibMCEnv_uint32 bytesNeededDataUUID = 0;
+		LibMCEnv_uint32 bytesWrittenDataUUID = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_AddBinaryData(m_pHandle, sName.c_str(), sMIMEType.c_str(), (LibMCEnv_uint64)ContentBuffer.size(), ContentBuffer.data(), 0, &bytesNeededDataUUID, nullptr));
+		std::vector<char> bufferDataUUID(bytesNeededDataUUID);
+		CheckError(m_pWrapper->m_WrapperTable.m_Build_AddBinaryData(m_pHandle, sName.c_str(), sMIMEType.c_str(), (LibMCEnv_uint64)ContentBuffer.size(), ContentBuffer.data(), bytesNeededDataUUID, &bytesWrittenDataUUID, &bufferDataUUID[0]));
+		
+		return std::string(&bufferDataUUID[0]);
+	}
+	
 	/**
 	 * Method definitions for class CSignalTrigger
 	 */
@@ -1871,6 +2394,16 @@ class CStateEnvironment : public CBase {
 		CheckError(m_pWrapper->m_WrapperTable.m_SignalTrigger_SetString(m_pHandle, sName.c_str(), sValue.c_str()));
 	}
 	
+	/**
+	* CSignalTrigger::SetUUID - sets a uuid value
+	* @param[in] sName - Name
+	* @param[in] sValue - Value
+	*/
+	void CSignalTrigger::SetUUID(const std::string & sName, const std::string & sValue)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_SignalTrigger_SetUUID(m_pHandle, sName.c_str(), sValue.c_str()));
+	}
+	
 	/**
 	* CSignalTrigger::SetDouble - sets a double
 	* @param[in] sName - Name
@@ -1917,6 +2450,22 @@ class CStateEnvironment : public CBase {
 		return std::string(&bufferValue[0]);
 	}
 	
+	/**
+	* CSignalTrigger::GetUUIDResult - returns a uuid value of the result
+	* @param[in] sName - Name
+	* @return Value
+	*/
+	std::string CSignalTrigger::GetUUIDResult(const std::string & sName)
+	{
+		LibMCEnv_uint32 bytesNeededValue = 0;
+		LibMCEnv_uint32 bytesWrittenValue = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_SignalTrigger_GetUUIDResult(m_pHandle, sName.c_str(), 0, &bytesNeededValue, nullptr));
+		std::vector<char> bufferValue(bytesNeededValue);
+		CheckError(m_pWrapper->m_WrapperTable.m_SignalTrigger_GetUUIDResult(m_pHandle, sName.c_str(), bytesNeededValue, &bytesWrittenValue, &bufferValue[0]));
+		
+		return std::string(&bufferValue[0]);
+	}
+	
 	/**
 	* CSignalTrigger::GetDoubleResult - returns a string value of the result
 	* @param[in] sName - Name
@@ -2029,6 +2578,22 @@ class CStateEnvironment : public CBase {
 		return std::string(&bufferValue[0]);
 	}
 	
+	/**
+	* CSignalHandler::GetUUID - gets a uuid value
+	* @param[in] sName - Name
+	* @return Value
+	*/
+	std::string CSignalHandler::GetUUID(const std::string & sName)
+	{
+		LibMCEnv_uint32 bytesNeededValue = 0;
+		LibMCEnv_uint32 bytesWrittenValue = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_SignalHandler_GetUUID(m_pHandle, sName.c_str(), 0, &bytesNeededValue, nullptr));
+		std::vector<char> bufferValue(bytesNeededValue);
+		CheckError(m_pWrapper->m_WrapperTable.m_SignalHandler_GetUUID(m_pHandle, sName.c_str(), bytesNeededValue, &bytesWrittenValue, &bufferValue[0]));
+		
+		return std::string(&bufferValue[0]);
+	}
+	
 	/**
 	* CSignalHandler::GetDouble - gets a double
 	* @param[in] sName - Name
@@ -2078,6 +2643,16 @@ class CStateEnvironment : public CBase {
 		CheckError(m_pWrapper->m_WrapperTable.m_SignalHandler_SetStringResult(m_pHandle, sName.c_str(), sValue.c_str()));
 	}
 	
+	/**
+	* CSignalHandler::SetUUIDResult - returns a uuid value of the result
+	* @param[in] sName - Name
+	* @param[in] sValue - Value
+	*/
+	void CSignalHandler::SetUUIDResult(const std::string & sName, const std::string & sValue)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_SignalHandler_SetUUIDResult(m_pHandle, sName.c_str(), sValue.c_str()));
+	}
+	
 	/**
 	* CSignalHandler::SetDoubleResult - returns a string value of the result
 	* @param[in] sName - Name
@@ -2113,15 +2688,15 @@ class CStateEnvironment : public CBase {
 	 */
 	
 	/**
-	* CStateEnvironment::CreateSignal - creates a signal object to trigger.
+	* CStateEnvironment::PrepareSignal - prepares a signal object to trigger later.
 	* @param[in] sMachineInstance - State machine instance name
 	* @param[in] sSignalName - Name Of signal channel.
 	* @return Signal trigger object.
 	*/
-	PSignalTrigger CStateEnvironment::CreateSignal(const std::string & sMachineInstance, const std::string & sSignalName)
+	PSignalTrigger CStateEnvironment::PrepareSignal(const std::string & sMachineInstance, const std::string & sSignalName)
 	{
 		LibMCEnvHandle hSignalInstance = nullptr;
-		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_CreateSignal(m_pHandle, sMachineInstance.c_str(), sSignalName.c_str(), &hSignalInstance));
+		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_PrepareSignal(m_pHandle, sMachineInstance.c_str(), sSignalName.c_str(), &hSignalInstance));
 		
 		if (!hSignalInstance) {
 			CheckError(LIBMCENV_ERROR_INVALIDPARAM);
@@ -2177,58 +2752,27 @@ class CStateEnvironment : public CBase {
 	}
 	
 	/**
-	* CStateEnvironment::LoadToolpath - Loads a toolpath from disk into memory.
-	* @param[in] sToolpathUUID - UUID of the toolpath entity.
-	*/
-	void CStateEnvironment::LoadToolpath(const std::string & sToolpathUUID)
-	{
-		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_LoadToolpath(m_pHandle, sToolpathUUID.c_str()));
-	}
-	
-	/**
-	* CStateEnvironment::UnloadToolpath - unloads the a toolpath. It MUST have been loaded to memory before with LoadToolpath.
-	* @param[in] sToolpathUUID - UUID of the toolpath entity.
-	*/
-	void CStateEnvironment::UnloadToolpath(const std::string & sToolpathUUID)
-	{
-		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_UnloadToolpath(m_pHandle, sToolpathUUID.c_str()));
-	}
-	
-	/**
-	* CStateEnvironment::UnloadAllToolpathes - unloads all toolpath in memory to clean up
-	*/
-	void CStateEnvironment::UnloadAllToolpathes()
-	{
-		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_UnloadAllToolpathes(m_pHandle));
-	}
-	
-	/**
-	* CStateEnvironment::CreateToolpathAccessor - creates an accessor object for a toolpath, if loaded to memory before.
-	* @param[in] sToolpathUUID - UUID of the toolpath entity.
-	* @return UUID of the toolpath entity.
+	* CStateEnvironment::GetBuildJob - Returns a instance of a build object.
+	* @param[in] sBuildUUID - UUID of the build entity.
+	* @return Build instance
 	*/
-	PToolpathAccessor CStateEnvironment::CreateToolpathAccessor(const std::string & sToolpathUUID)
+	PBuild CStateEnvironment::GetBuildJob(const std::string & sBuildUUID)
 	{
-		LibMCEnvHandle hToolpathInstance = nullptr;
-		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_CreateToolpathAccessor(m_pHandle, sToolpathUUID.c_str(), &hToolpathInstance));
+		LibMCEnvHandle hBuildInstance = nullptr;
+		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_GetBuildJob(m_pHandle, sBuildUUID.c_str(), &hBuildInstance));
 		
-		if (!hToolpathInstance) {
+		if (!hBuildInstance) {
 			CheckError(LIBMCENV_ERROR_INVALIDPARAM);
 		}
-		return std::make_shared<CToolpathAccessor>(m_pWrapper, hToolpathInstance);
+		return std::make_shared<CBuild>(m_pWrapper, hBuildInstance);
 	}
 	
 	/**
-	* CStateEnvironment::ToolpathIsLoaded - checks, if a toolpath object is loaded to memory.
-	* @param[in] sToolpathUUID - UUID of the toolpath entity.
-	* @return returns if toolpath is loaded.
+	* CStateEnvironment::UnloadAllToolpathes - unloads all toolpath in memory to clean up
 	*/
-	bool CStateEnvironment::ToolpathIsLoaded(const std::string & sToolpathUUID)
+	void CStateEnvironment::UnloadAllToolpathes()
 	{
-		bool resultIsLoaded = 0;
-		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_ToolpathIsLoaded(m_pHandle, sToolpathUUID.c_str(), &resultIsLoaded));
-		
-		return resultIsLoaded;
+		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_UnloadAllToolpathes(m_pHandle));
 	}
 	
 	/**
@@ -2298,6 +2842,16 @@ class CStateEnvironment : public CBase {
 		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_StoreString(m_pHandle, sName.c_str(), sValue.c_str()));
 	}
 	
+	/**
+	* CStateEnvironment::StoreUUID - stores a uuid in the current state machine
+	* @param[in] sName - Name
+	* @param[in] sValue - Value
+	*/
+	void CStateEnvironment::StoreUUID(const std::string & sName, const std::string & sValue)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_StoreUUID(m_pHandle, sName.c_str(), sValue.c_str()));
+	}
+	
 	/**
 	* CStateEnvironment::StoreInteger - stores a string in the current state machine
 	* @param[in] sName - Name
@@ -2355,6 +2909,22 @@ class CStateEnvironment : public CBase {
 		return std::string(&bufferValue[0]);
 	}
 	
+	/**
+	* CStateEnvironment::RetrieveUUID - retrieves a uuid from the current state machine. Fails if value has not been stored before.
+	* @param[in] sName - Name
+	* @return Value
+	*/
+	std::string CStateEnvironment::RetrieveUUID(const std::string & sName)
+	{
+		LibMCEnv_uint32 bytesNeededValue = 0;
+		LibMCEnv_uint32 bytesWrittenValue = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_RetrieveUUID(m_pHandle, sName.c_str(), 0, &bytesNeededValue, nullptr));
+		std::vector<char> bufferValue(bytesNeededValue);
+		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_RetrieveUUID(m_pHandle, sName.c_str(), bytesNeededValue, &bytesWrittenValue, &bufferValue[0]));
+		
+		return std::string(&bufferValue[0]);
+	}
+	
 	/**
 	* CStateEnvironment::RetrieveInteger - retrieves a string from the current state machine. Fails if value has not been stored before.
 	* @param[in] sName - Name
@@ -2430,6 +3000,17 @@ class CStateEnvironment : public CBase {
 		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_SetStringParameter(m_pHandle, sParameterGroup.c_str(), sParameterName.c_str(), sValue.c_str()));
 	}
 	
+	/**
+	* CStateEnvironment::SetUUIDParameter - sets a uuid parameter
+	* @param[in] sParameterGroup - Parameter Group
+	* @param[in] sParameterName - Parameter Name
+	* @param[in] sValue - Value to set
+	*/
+	void CStateEnvironment::SetUUIDParameter(const std::string & sParameterGroup, const std::string & sParameterName, const std::string & sValue)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_SetUUIDParameter(m_pHandle, sParameterGroup.c_str(), sParameterName.c_str(), sValue.c_str()));
+	}
+	
 	/**
 	* CStateEnvironment::SetDoubleParameter - sets a double parameter
 	* @param[in] sParameterGroup - Parameter Group
@@ -2480,6 +3061,23 @@ class CStateEnvironment : public CBase {
 		return std::string(&bufferValue[0]);
 	}
 	
+	/**
+	* CStateEnvironment::GetUUIDParameter - returns a uuid parameter
+	* @param[in] sParameterGroup - Parameter Group
+	* @param[in] sParameterName - Parameter Name
+	* @return Value to set
+	*/
+	std::string CStateEnvironment::GetUUIDParameter(const std::string & sParameterGroup, const std::string & sParameterName)
+	{
+		LibMCEnv_uint32 bytesNeededValue = 0;
+		LibMCEnv_uint32 bytesWrittenValue = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_GetUUIDParameter(m_pHandle, sParameterGroup.c_str(), sParameterName.c_str(), 0, &bytesNeededValue, nullptr));
+		std::vector<char> bufferValue(bytesNeededValue);
+		CheckError(m_pWrapper->m_WrapperTable.m_StateEnvironment_GetUUIDParameter(m_pHandle, sParameterGroup.c_str(), sParameterName.c_str(), bytesNeededValue, &bytesWrittenValue, &bufferValue[0]));
+		
+		return std::string(&bufferValue[0]);
+	}
+	
 	/**
 	* CStateEnvironment::GetDoubleParameter - returns a double parameter
 	* @param[in] sParameterGroup - Parameter Group
diff --git a/Framework/HeadersDev/CppDynamic/libmcenv_types.hpp b/Framework/HeadersDev/CppDynamic/libmcenv_types.hpp
index 3bba5918..be35dc2b 100644
--- a/Framework/HeadersDev/CppDynamic/libmcenv_types.hpp
+++ b/Framework/HeadersDev/CppDynamic/libmcenv_types.hpp
@@ -147,6 +147,7 @@ inline const char * LIBMCENV_GETERRORSTRING (LibMCEnvResult nErrorCode) {
 typedef LibMCEnvHandle LibMCEnv_Base;
 typedef LibMCEnvHandle LibMCEnv_ToolpathLayer;
 typedef LibMCEnvHandle LibMCEnv_ToolpathAccessor;
+typedef LibMCEnvHandle LibMCEnv_Build;
 typedef LibMCEnvHandle LibMCEnv_SignalTrigger;
 typedef LibMCEnvHandle LibMCEnv_SignalHandler;
 typedef LibMCEnvHandle LibMCEnv_StateEnvironment;
@@ -164,6 +165,17 @@ namespace LibMCEnv {
     Polyline = 3
   };
   
+  enum class eToolpathProfileValueType : LibMCEnv_int32 {
+    Custom = 0,
+    Speed = 1,
+    JumpSpeed = 2,
+    ExtrusionFactor = 3,
+    LaserPower = 4,
+    StartDelay = 5,
+    EndDelay = 6,
+    PolyDelay = 7
+  };
+  
   /*************************************************************************************************************************
    Declaration of structs
   **************************************************************************************************************************/
@@ -171,7 +183,7 @@ namespace LibMCEnv {
   #pragma pack (1)
   
   typedef struct {
-      LibMCEnv_single m_Coordinates[2];
+      LibMCEnv_int32 m_Coordinates[2];
   } sPosition2D;
   
   #pragma pack ()
@@ -180,6 +192,7 @@ namespace LibMCEnv {
 
 // define legacy C-names for enums, structs and function types
 typedef LibMCEnv::eToolpathSegmentType eLibMCEnvToolpathSegmentType;
+typedef LibMCEnv::eToolpathProfileValueType eLibMCEnvToolpathProfileValueType;
 typedef LibMCEnv::sPosition2D sLibMCEnvPosition2D;
 
 #endif // __LIBMCENV_TYPES_HEADER_CPP
diff --git a/Framework/InterfacesCore/libmc_abi.hpp b/Framework/InterfacesCore/libmc_abi.hpp
index d35a74a8..1585bb83 100644
--- a/Framework/InterfacesCore/libmc_abi.hpp
+++ b/Framework/InterfacesCore/libmc_abi.hpp
@@ -62,39 +62,87 @@ extern "C" {
 **************************************************************************************************************************/
 
 /*************************************************************************************************************************
- Class definition for APIResponse
+ Class definition for APIRequestHandler
 **************************************************************************************************************************/
 
 /**
-* returns the HTTP Errorcode to set (200 for success).
+* checks if the raw body is needed to handle the request.
 *
-* @param[in] pAPIResponse - APIResponse instance.
-* @param[out] pHTTPCode - HTTP Code
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[out] pValue - Flag, if the raw body is needed in the request.
 * @return error code or 0 (success)
 */
-LIBMC_DECLSPEC LibMCResult libmc_apiresponse_gethttpcode(LibMC_APIResponse pAPIResponse, LibMC_uint32 * pHTTPCode);
+LIBMC_DECLSPEC LibMCResult libmc_apirequesthandler_expectsrawbody(LibMC_APIRequestHandler pAPIRequestHandler, bool * pValue);
 
 /**
-* returns the content type string of the data.
+* checks if the parsed form data is needed to handle the request.
 *
-* @param[in] pAPIResponse - APIResponse instance.
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[out] pFieldCount - Number of Form Data entries that are expected.
+* @param[out] pValue - Flag, if the parsed form data is needed in the request.
+* @return error code or 0 (success)
+*/
+LIBMC_DECLSPEC LibMCResult libmc_apirequesthandler_expectsformdata(LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint32 * pFieldCount, bool * pValue);
+
+/**
+* returns details of expected form data.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] nFieldIndex - Index of Form Data Field (0..FieldCount - 1)
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name of the expected form data field., may be NULL
+* @param[out] pIsFile - Flag, if the field Is a file field.
+* @param[out] pMandatory - Flag, if the field MUST be present.
+* @return error code or 0 (success)
+*/
+LIBMC_DECLSPEC LibMCResult libmc_apirequesthandler_getformdatadetails(LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint32 nFieldIndex, const LibMC_uint32 nNameBufferSize, LibMC_uint32* pNameNeededChars, char * pNameBuffer, bool * pIsFile, bool * pMandatory);
+
+/**
+* passes the a form data field to the request handler. Call only, if ExpectsFormData returns true.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] pName - Name of the form data field.
+* @param[in] nDataFieldBufferSize - Number of elements in buffer
+* @param[in] pDataFieldBuffer - uint8 buffer of DataField that was sent.
+* @return error code or 0 (success)
+*/
+LIBMC_DECLSPEC LibMCResult libmc_apirequesthandler_setformdatafield(LibMC_APIRequestHandler pAPIRequestHandler, const char * pName, LibMC_uint64 nDataFieldBufferSize, const LibMC_uint8 * pDataFieldBuffer);
+
+/**
+* passes the a form string field to the request handler. Call only, if ExpectsFormData returns true.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] pName - Name of the form data field.
+* @param[in] pString - DataString that was sent.
+* @return error code or 0 (success)
+*/
+LIBMC_DECLSPEC LibMCResult libmc_apirequesthandler_setformstringfield(LibMC_APIRequestHandler pAPIRequestHandler, const char * pName, const char * pString);
+
+/**
+* handles the request.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] nRawBodyBufferSize - Number of elements in buffer
+* @param[in] pRawBodyBuffer - uint8 buffer of Raw Body that was sent. Only necessary, if ExpectsRawBody returns true.
 * @param[in] nContentTypeBufferSize - size of the buffer (including trailing 0)
 * @param[out] pContentTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
-* @param[out] pContentTypeBuffer -  buffer of Content Type., may be NULL
+* @param[out] pContentTypeBuffer -  buffer of the resulting Content Type String of the data., may be NULL
+* @param[out] pHTTPCode - the resulting HTTP Errorcode (200 for success).
 * @return error code or 0 (success)
 */
-LIBMC_DECLSPEC LibMCResult libmc_apiresponse_getcontenttype(LibMC_APIResponse pAPIResponse, const LibMC_uint32 nContentTypeBufferSize, LibMC_uint32* pContentTypeNeededChars, char * pContentTypeBuffer);
+LIBMC_DECLSPEC LibMCResult libmc_apirequesthandler_handle(LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint64 nRawBodyBufferSize, const LibMC_uint8 * pRawBodyBuffer, const LibMC_uint32 nContentTypeBufferSize, LibMC_uint32* pContentTypeNeededChars, char * pContentTypeBuffer, LibMC_uint32 * pHTTPCode);
 
 /**
-* returns the stream content of the data.
+* returns the cached stream content of the resulting data. Call only after Handle().
 *
-* @param[in] pAPIResponse - APIResponse instance.
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
 * @param[in] nDataBufferSize - Number of elements in buffer
 * @param[out] pDataNeededCount - will be filled with the count of the written elements, or needed buffer size.
 * @param[out] pDataBuffer - uint8 buffer of Binary stream data
 * @return error code or 0 (success)
 */
-LIBMC_DECLSPEC LibMCResult libmc_apiresponse_getdata(LibMC_APIResponse pAPIResponse, const LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer);
+LIBMC_DECLSPEC LibMCResult libmc_apirequesthandler_getresultdata(LibMC_APIRequestHandler pAPIRequestHandler, const LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer);
 
 /*************************************************************************************************************************
  Class definition for MCContext
@@ -157,26 +205,15 @@ LIBMC_DECLSPEC LibMCResult libmc_mccontext_loadclientpackage(LibMC_MCContext pMC
 LIBMC_DECLSPEC LibMCResult libmc_mccontext_log(LibMC_MCContext pMCContext, const char * pMessage, LibMC::eLogSubSystem eSubsystem, LibMC::eLogLevel eLogLevel);
 
 /**
-* handle an API GET request.
-*
-* @param[in] pMCContext - MCContext instance.
-* @param[in] pURI - URI to serve
-* @param[out] pResponse - Response instance.
-* @return error code or 0 (success)
-*/
-LIBMC_DECLSPEC LibMCResult libmc_mccontext_handleapigetrequest(LibMC_MCContext pMCContext, const char * pURI, LibMC_APIResponse * pResponse);
-
-/**
-* handle an API POST request.
+* creates an API request handler.
 *
 * @param[in] pMCContext - MCContext instance.
 * @param[in] pURI - URI to serve
-* @param[in] nBodyBufferSize - Number of elements in buffer
-* @param[in] pBodyBuffer - uint8 buffer of Body that was sent.
-* @param[out] pResponse - Response instance.
+* @param[in] pRequestMethod - Request Method
+* @param[out] pHandlerInstance - Request Handler instance.
 * @return error code or 0 (success)
 */
-LIBMC_DECLSPEC LibMCResult libmc_mccontext_handleapipostrequest(LibMC_MCContext pMCContext, const char * pURI, LibMC_uint64 nBodyBufferSize, const LibMC_uint8 * pBodyBuffer, LibMC_APIResponse * pResponse);
+LIBMC_DECLSPEC LibMCResult libmc_mccontext_createapirequesthandler(LibMC_MCContext pMCContext, const char * pURI, const char * pRequestMethod, LibMC_APIRequestHandler * pHandlerInstance);
 
 /*************************************************************************************************************************
  Global functions
diff --git a/Framework/InterfacesCore/libmc_interfaces.hpp b/Framework/InterfacesCore/libmc_interfaces.hpp
index c16ca006..e2e6d1f1 100644
--- a/Framework/InterfacesCore/libmc_interfaces.hpp
+++ b/Framework/InterfacesCore/libmc_interfaces.hpp
@@ -56,7 +56,7 @@ namespace Impl {
  Forward declarations of class interfaces
 */
 class IBase;
-class IAPIResponse;
+class IAPIRequestHandler;
 class IMCContext;
 
 
@@ -239,34 +239,68 @@ typedef IBaseSharedPtr<IBase> PIBase;
 
 
 /*************************************************************************************************************************
- Class interface for APIResponse 
+ Class interface for APIRequestHandler 
 **************************************************************************************************************************/
 
-class IAPIResponse : public virtual IBase {
+class IAPIRequestHandler : public virtual IBase {
 public:
 	/**
-	* IAPIResponse::GetHTTPCode - returns the HTTP Errorcode to set (200 for success).
-	* @return HTTP Code
+	* IAPIRequestHandler::ExpectsRawBody - checks if the raw body is needed to handle the request.
+	* @return Flag, if the raw body is needed in the request.
 	*/
-	virtual LibMC_uint32 GetHTTPCode() = 0;
+	virtual bool ExpectsRawBody() = 0;
 
 	/**
-	* IAPIResponse::GetContentType - returns the content type string of the data.
-	* @return Content Type.
+	* IAPIRequestHandler::ExpectsFormData - checks if the parsed form data is needed to handle the request.
+	* @param[out] nFieldCount - Number of Form Data entries that are expected.
+	* @return Flag, if the parsed form data is needed in the request.
 	*/
-	virtual std::string GetContentType() = 0;
+	virtual bool ExpectsFormData(LibMC_uint32 & nFieldCount) = 0;
 
 	/**
-	* IAPIResponse::GetData - returns the stream content of the data.
+	* IAPIRequestHandler::GetFormDataDetails - returns details of expected form data.
+	* @param[in] nFieldIndex - Index of Form Data Field (0..FieldCount - 1)
+	* @param[out] sName - Name of the expected form data field.
+	* @param[out] bIsFile - Flag, if the field Is a file field.
+	* @param[out] bMandatory - Flag, if the field MUST be present.
+	*/
+	virtual void GetFormDataDetails(const LibMC_uint32 nFieldIndex, std::string & sName, bool & bIsFile, bool & bMandatory) = 0;
+
+	/**
+	* IAPIRequestHandler::SetFormDataField - passes the a form data field to the request handler. Call only, if ExpectsFormData returns true.
+	* @param[in] sName - Name of the form data field.
+	* @param[in] nDataFieldBufferSize - Number of elements in buffer
+	* @param[in] pDataFieldBuffer - DataField that was sent.
+	*/
+	virtual void SetFormDataField(const std::string & sName, const LibMC_uint64 nDataFieldBufferSize, const LibMC_uint8 * pDataFieldBuffer) = 0;
+
+	/**
+	* IAPIRequestHandler::SetFormStringField - passes the a form string field to the request handler. Call only, if ExpectsFormData returns true.
+	* @param[in] sName - Name of the form data field.
+	* @param[in] sString - DataString that was sent.
+	*/
+	virtual void SetFormStringField(const std::string & sName, const std::string & sString) = 0;
+
+	/**
+	* IAPIRequestHandler::Handle - handles the request.
+	* @param[in] nRawBodyBufferSize - Number of elements in buffer
+	* @param[in] pRawBodyBuffer - Raw Body that was sent. Only necessary, if ExpectsRawBody returns true.
+	* @param[out] sContentType - the resulting Content Type String of the data.
+	* @param[out] nHTTPCode - the resulting HTTP Errorcode (200 for success).
+	*/
+	virtual void Handle(const LibMC_uint64 nRawBodyBufferSize, const LibMC_uint8 * pRawBodyBuffer, std::string & sContentType, LibMC_uint32 & nHTTPCode) = 0;
+
+	/**
+	* IAPIRequestHandler::GetResultData - returns the cached stream content of the resulting data. Call only after Handle().
 	* @param[in] nDataBufferSize - Number of elements in buffer
 	* @param[out] pDataNeededCount - will be filled with the count of the written structs, or needed buffer size.
 	* @param[out] pDataBuffer - uint8 buffer of Binary stream data
 	*/
-	virtual void GetData(LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer) = 0;
+	virtual void GetResultData(LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer) = 0;
 
 };
 
-typedef IBaseSharedPtr<IAPIResponse> PIAPIResponse;
+typedef IBaseSharedPtr<IAPIRequestHandler> PIAPIRequestHandler;
 
 
 /*************************************************************************************************************************
@@ -314,20 +348,12 @@ class IMCContext : public virtual IBase {
 	virtual void Log(const std::string & sMessage, const LibMC::eLogSubSystem eSubsystem, const LibMC::eLogLevel eLogLevel) = 0;
 
 	/**
-	* IMCContext::HandleAPIGetRequest - handle an API GET request.
-	* @param[in] sURI - URI to serve
-	* @return Response instance.
-	*/
-	virtual IAPIResponse * HandleAPIGetRequest(const std::string & sURI) = 0;
-
-	/**
-	* IMCContext::HandleAPIPostRequest - handle an API POST request.
+	* IMCContext::CreateAPIRequestHandler - creates an API request handler.
 	* @param[in] sURI - URI to serve
-	* @param[in] nBodyBufferSize - Number of elements in buffer
-	* @param[in] pBodyBuffer - Body that was sent.
-	* @return Response instance.
+	* @param[in] sRequestMethod - Request Method
+	* @return Request Handler instance.
 	*/
-	virtual IAPIResponse * HandleAPIPostRequest(const std::string & sURI, const LibMC_uint64 nBodyBufferSize, const LibMC_uint8 * pBodyBuffer) = 0;
+	virtual IAPIRequestHandler * CreateAPIRequestHandler(const std::string & sURI, const std::string & sRequestMethod) = 0;
 
 };
 
diff --git a/Framework/InterfacesCore/libmc_interfacewrapper.cpp b/Framework/InterfacesCore/libmc_interfacewrapper.cpp
index 4b74a435..352a627b 100644
--- a/Framework/InterfacesCore/libmc_interfacewrapper.cpp
+++ b/Framework/InterfacesCore/libmc_interfacewrapper.cpp
@@ -81,20 +81,20 @@ LibMCResult handleUnhandledException(IBase * pIBaseClass)
 **************************************************************************************************************************/
 
 /*************************************************************************************************************************
- Class implementation for APIResponse
+ Class implementation for APIRequestHandler
 **************************************************************************************************************************/
-LibMCResult libmc_apiresponse_gethttpcode(LibMC_APIResponse pAPIResponse, LibMC_uint32 * pHTTPCode)
+LibMCResult libmc_apirequesthandler_expectsrawbody(LibMC_APIRequestHandler pAPIRequestHandler, bool * pValue)
 {
-	IBase* pIBaseClass = (IBase *)pAPIResponse;
+	IBase* pIBaseClass = (IBase *)pAPIRequestHandler;
 
 	try {
-		if (pHTTPCode == nullptr)
+		if (pValue == nullptr)
 			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
-		IAPIResponse* pIAPIResponse = dynamic_cast<IAPIResponse*>(pIBaseClass);
-		if (!pIAPIResponse)
+		IAPIRequestHandler* pIAPIRequestHandler = dynamic_cast<IAPIRequestHandler*>(pIBaseClass);
+		if (!pIAPIRequestHandler)
 			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDCAST);
 		
-		*pHTTPCode = pIAPIResponse->GetHTTPCode();
+		*pValue = pIAPIRequestHandler->ExpectsRawBody();
 
 		return LIBMC_SUCCESS;
 	}
@@ -109,30 +109,173 @@ LibMCResult libmc_apiresponse_gethttpcode(LibMC_APIResponse pAPIResponse, LibMC_
 	}
 }
 
-LibMCResult libmc_apiresponse_getcontenttype(LibMC_APIResponse pAPIResponse, const LibMC_uint32 nContentTypeBufferSize, LibMC_uint32* pContentTypeNeededChars, char * pContentTypeBuffer)
+LibMCResult libmc_apirequesthandler_expectsformdata(LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint32 * pFieldCount, bool * pValue)
 {
-	IBase* pIBaseClass = (IBase *)pAPIResponse;
+	IBase* pIBaseClass = (IBase *)pAPIRequestHandler;
 
 	try {
+		if (!pFieldCount)
+			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
+		if (pValue == nullptr)
+			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
+		IAPIRequestHandler* pIAPIRequestHandler = dynamic_cast<IAPIRequestHandler*>(pIBaseClass);
+		if (!pIAPIRequestHandler)
+			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDCAST);
+		
+		*pValue = pIAPIRequestHandler->ExpectsFormData(*pFieldCount);
+
+		return LIBMC_SUCCESS;
+	}
+	catch (ELibMCInterfaceException & Exception) {
+		return handleLibMCException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCResult libmc_apirequesthandler_getformdatadetails(LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint32 nFieldIndex, const LibMC_uint32 nNameBufferSize, LibMC_uint32* pNameNeededChars, char * pNameBuffer, bool * pIsFile, bool * pMandatory)
+{
+	IBase* pIBaseClass = (IBase *)pAPIRequestHandler;
+
+	try {
+		if ( (!pNameBuffer) && !(pNameNeededChars) )
+			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
+		if (!pIsFile)
+			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
+		if (!pMandatory)
+			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
+		std::string sName("");
+		IAPIRequestHandler* pIAPIRequestHandler = dynamic_cast<IAPIRequestHandler*>(pIBaseClass);
+		if (!pIAPIRequestHandler)
+			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pNameBuffer == nullptr);
+		if (isCacheCall) {
+			pIAPIRequestHandler->GetFormDataDetails(nFieldIndex, sName, *pIsFile, *pMandatory);
+
+			pIAPIRequestHandler->_setCache (new ParameterCache_3<std::string, bool, bool> (sName, *pIsFile, *pMandatory));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_3<std::string, bool, bool>*> (pIAPIRequestHandler->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDCAST);
+			cache->retrieveData (sName, *pIsFile, *pMandatory);
+			pIAPIRequestHandler->_setCache (nullptr);
+		}
+		
+		if (pNameNeededChars)
+			*pNameNeededChars = (LibMC_uint32) (sName.size()+1);
+		if (pNameBuffer) {
+			if (sName.size() >= nNameBufferSize)
+				throw ELibMCInterfaceException (LIBMC_ERROR_BUFFERTOOSMALL);
+			for (size_t iName = 0; iName < sName.size(); iName++)
+				pNameBuffer[iName] = sName[iName];
+			pNameBuffer[sName.size()] = 0;
+		}
+		return LIBMC_SUCCESS;
+	}
+	catch (ELibMCInterfaceException & Exception) {
+		return handleLibMCException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCResult libmc_apirequesthandler_setformdatafield(LibMC_APIRequestHandler pAPIRequestHandler, const char * pName, LibMC_uint64 nDataFieldBufferSize, const LibMC_uint8 * pDataFieldBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pAPIRequestHandler;
+
+	try {
+		if (pName == nullptr)
+			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
+		if ( (!pDataFieldBuffer) && (nDataFieldBufferSize>0))
+			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
+		std::string sName(pName);
+		IAPIRequestHandler* pIAPIRequestHandler = dynamic_cast<IAPIRequestHandler*>(pIBaseClass);
+		if (!pIAPIRequestHandler)
+			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDCAST);
+		
+		pIAPIRequestHandler->SetFormDataField(sName, nDataFieldBufferSize, pDataFieldBuffer);
+
+		return LIBMC_SUCCESS;
+	}
+	catch (ELibMCInterfaceException & Exception) {
+		return handleLibMCException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCResult libmc_apirequesthandler_setformstringfield(LibMC_APIRequestHandler pAPIRequestHandler, const char * pName, const char * pString)
+{
+	IBase* pIBaseClass = (IBase *)pAPIRequestHandler;
+
+	try {
+		if (pName == nullptr)
+			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
+		if (pString == nullptr)
+			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
+		std::string sName(pName);
+		std::string sString(pString);
+		IAPIRequestHandler* pIAPIRequestHandler = dynamic_cast<IAPIRequestHandler*>(pIBaseClass);
+		if (!pIAPIRequestHandler)
+			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDCAST);
+		
+		pIAPIRequestHandler->SetFormStringField(sName, sString);
+
+		return LIBMC_SUCCESS;
+	}
+	catch (ELibMCInterfaceException & Exception) {
+		return handleLibMCException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCResult libmc_apirequesthandler_handle(LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint64 nRawBodyBufferSize, const LibMC_uint8 * pRawBodyBuffer, const LibMC_uint32 nContentTypeBufferSize, LibMC_uint32* pContentTypeNeededChars, char * pContentTypeBuffer, LibMC_uint32 * pHTTPCode)
+{
+	IBase* pIBaseClass = (IBase *)pAPIRequestHandler;
+
+	try {
+		if ( (!pRawBodyBuffer) && (nRawBodyBufferSize>0))
+			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
 		if ( (!pContentTypeBuffer) && !(pContentTypeNeededChars) )
 			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
+		if (!pHTTPCode)
+			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
 		std::string sContentType("");
-		IAPIResponse* pIAPIResponse = dynamic_cast<IAPIResponse*>(pIBaseClass);
-		if (!pIAPIResponse)
+		IAPIRequestHandler* pIAPIRequestHandler = dynamic_cast<IAPIRequestHandler*>(pIBaseClass);
+		if (!pIAPIRequestHandler)
 			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDCAST);
 		
 		bool isCacheCall = (pContentTypeBuffer == nullptr);
 		if (isCacheCall) {
-			sContentType = pIAPIResponse->GetContentType();
+			pIAPIRequestHandler->Handle(nRawBodyBufferSize, pRawBodyBuffer, sContentType, *pHTTPCode);
 
-			pIAPIResponse->_setCache (new ParameterCache_1<std::string> (sContentType));
+			pIAPIRequestHandler->_setCache (new ParameterCache_2<std::string, LibMC_uint32> (sContentType, *pHTTPCode));
 		}
 		else {
-			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIAPIResponse->_getCache ());
+			auto cache = dynamic_cast<ParameterCache_2<std::string, LibMC_uint32>*> (pIAPIRequestHandler->_getCache ());
 			if (cache == nullptr)
 				throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDCAST);
-			cache->retrieveData (sContentType);
-			pIAPIResponse->_setCache (nullptr);
+			cache->retrieveData (sContentType, *pHTTPCode);
+			pIAPIRequestHandler->_setCache (nullptr);
 		}
 		
 		if (pContentTypeNeededChars)
@@ -157,18 +300,18 @@ LibMCResult libmc_apiresponse_getcontenttype(LibMC_APIResponse pAPIResponse, con
 	}
 }
 
-LibMCResult libmc_apiresponse_getdata(LibMC_APIResponse pAPIResponse, const LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer)
+LibMCResult libmc_apirequesthandler_getresultdata(LibMC_APIRequestHandler pAPIRequestHandler, const LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer)
 {
-	IBase* pIBaseClass = (IBase *)pAPIResponse;
+	IBase* pIBaseClass = (IBase *)pAPIRequestHandler;
 
 	try {
 		if ((!pDataBuffer) && !(pDataNeededCount))
 			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
-		IAPIResponse* pIAPIResponse = dynamic_cast<IAPIResponse*>(pIBaseClass);
-		if (!pIAPIResponse)
+		IAPIRequestHandler* pIAPIRequestHandler = dynamic_cast<IAPIRequestHandler*>(pIBaseClass);
+		if (!pIAPIRequestHandler)
 			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDCAST);
 		
-		pIAPIResponse->GetData(nDataBufferSize, pDataNeededCount, pDataBuffer);
+		pIAPIRequestHandler->GetResultData(nDataBufferSize, pDataNeededCount, pDataBuffer);
 
 		return LIBMC_SUCCESS;
 	}
@@ -345,57 +488,27 @@ LibMCResult libmc_mccontext_log(LibMC_MCContext pMCContext, const char * pMessag
 	}
 }
 
-LibMCResult libmc_mccontext_handleapigetrequest(LibMC_MCContext pMCContext, const char * pURI, LibMC_APIResponse * pResponse)
-{
-	IBase* pIBaseClass = (IBase *)pMCContext;
-
-	try {
-		if (pURI == nullptr)
-			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
-		if (pResponse == nullptr)
-			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
-		std::string sURI(pURI);
-		IBase* pBaseResponse(nullptr);
-		IMCContext* pIMCContext = dynamic_cast<IMCContext*>(pIBaseClass);
-		if (!pIMCContext)
-			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDCAST);
-		
-		pBaseResponse = pIMCContext->HandleAPIGetRequest(sURI);
-
-		*pResponse = (IBase*)(pBaseResponse);
-		return LIBMC_SUCCESS;
-	}
-	catch (ELibMCInterfaceException & Exception) {
-		return handleLibMCException(pIBaseClass, Exception);
-	}
-	catch (std::exception & StdException) {
-		return handleStdException(pIBaseClass, StdException);
-	}
-	catch (...) {
-		return handleUnhandledException(pIBaseClass);
-	}
-}
-
-LibMCResult libmc_mccontext_handleapipostrequest(LibMC_MCContext pMCContext, const char * pURI, LibMC_uint64 nBodyBufferSize, const LibMC_uint8 * pBodyBuffer, LibMC_APIResponse * pResponse)
+LibMCResult libmc_mccontext_createapirequesthandler(LibMC_MCContext pMCContext, const char * pURI, const char * pRequestMethod, LibMC_APIRequestHandler * pHandlerInstance)
 {
 	IBase* pIBaseClass = (IBase *)pMCContext;
 
 	try {
 		if (pURI == nullptr)
 			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
-		if ( (!pBodyBuffer) && (nBodyBufferSize>0))
+		if (pRequestMethod == nullptr)
 			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
-		if (pResponse == nullptr)
+		if (pHandlerInstance == nullptr)
 			throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDPARAM);
 		std::string sURI(pURI);
-		IBase* pBaseResponse(nullptr);
+		std::string sRequestMethod(pRequestMethod);
+		IBase* pBaseHandlerInstance(nullptr);
 		IMCContext* pIMCContext = dynamic_cast<IMCContext*>(pIBaseClass);
 		if (!pIMCContext)
 			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDCAST);
 		
-		pBaseResponse = pIMCContext->HandleAPIPostRequest(sURI, nBodyBufferSize, pBodyBuffer);
+		pBaseHandlerInstance = pIMCContext->CreateAPIRequestHandler(sURI, sRequestMethod);
 
-		*pResponse = (IBase*)(pBaseResponse);
+		*pHandlerInstance = (IBase*)(pBaseHandlerInstance);
 		return LIBMC_SUCCESS;
 	}
 	catch (ELibMCInterfaceException & Exception) {
@@ -424,12 +537,20 @@ LibMCResult LibMC::Impl::LibMC_GetProcAddress (const char * pProcName, void ** p
 	*ppProcAddress = nullptr;
 	std::string sProcName (pProcName);
 	
-	if (sProcName == "libmc_apiresponse_gethttpcode") 
-		*ppProcAddress = (void*) &libmc_apiresponse_gethttpcode;
-	if (sProcName == "libmc_apiresponse_getcontenttype") 
-		*ppProcAddress = (void*) &libmc_apiresponse_getcontenttype;
-	if (sProcName == "libmc_apiresponse_getdata") 
-		*ppProcAddress = (void*) &libmc_apiresponse_getdata;
+	if (sProcName == "libmc_apirequesthandler_expectsrawbody") 
+		*ppProcAddress = (void*) &libmc_apirequesthandler_expectsrawbody;
+	if (sProcName == "libmc_apirequesthandler_expectsformdata") 
+		*ppProcAddress = (void*) &libmc_apirequesthandler_expectsformdata;
+	if (sProcName == "libmc_apirequesthandler_getformdatadetails") 
+		*ppProcAddress = (void*) &libmc_apirequesthandler_getformdatadetails;
+	if (sProcName == "libmc_apirequesthandler_setformdatafield") 
+		*ppProcAddress = (void*) &libmc_apirequesthandler_setformdatafield;
+	if (sProcName == "libmc_apirequesthandler_setformstringfield") 
+		*ppProcAddress = (void*) &libmc_apirequesthandler_setformstringfield;
+	if (sProcName == "libmc_apirequesthandler_handle") 
+		*ppProcAddress = (void*) &libmc_apirequesthandler_handle;
+	if (sProcName == "libmc_apirequesthandler_getresultdata") 
+		*ppProcAddress = (void*) &libmc_apirequesthandler_getresultdata;
 	if (sProcName == "libmc_mccontext_registerlibrarypath") 
 		*ppProcAddress = (void*) &libmc_mccontext_registerlibrarypath;
 	if (sProcName == "libmc_mccontext_parseconfiguration") 
@@ -442,10 +563,8 @@ LibMCResult LibMC::Impl::LibMC_GetProcAddress (const char * pProcName, void ** p
 		*ppProcAddress = (void*) &libmc_mccontext_loadclientpackage;
 	if (sProcName == "libmc_mccontext_log") 
 		*ppProcAddress = (void*) &libmc_mccontext_log;
-	if (sProcName == "libmc_mccontext_handleapigetrequest") 
-		*ppProcAddress = (void*) &libmc_mccontext_handleapigetrequest;
-	if (sProcName == "libmc_mccontext_handleapipostrequest") 
-		*ppProcAddress = (void*) &libmc_mccontext_handleapipostrequest;
+	if (sProcName == "libmc_mccontext_createapirequesthandler") 
+		*ppProcAddress = (void*) &libmc_mccontext_createapirequesthandler;
 	if (sProcName == "libmc_getversion") 
 		*ppProcAddress = (void*) &libmc_getversion;
 	if (sProcName == "libmc_getlasterror") 
diff --git a/Framework/InterfacesCore/libmc_types.hpp b/Framework/InterfacesCore/libmc_types.hpp
index f167a9db..47324762 100644
--- a/Framework/InterfacesCore/libmc_types.hpp
+++ b/Framework/InterfacesCore/libmc_types.hpp
@@ -266,6 +266,46 @@ typedef void * LibMC_pvoid;
 #define LIBMC_ERROR_DUPLICATESTORAGESTREAM 239
 #define LIBMC_ERROR_INVALIDPARTIALUPLOAD 240
 #define LIBMC_ERROR_PARTIALUPLOADNOTFINISHED 241
+#define LIBMC_ERROR_APIREQUESTNOTHANDLED 242
+#define LIBMC_ERROR_APIREQUESTALREADYHANDLED 243
+#define LIBMC_ERROR_INVALIDAPIREQUESTTYPE 244
+#define LIBMC_ERROR_INVALIDUPLOADSTREAM 245
+#define LIBMC_ERROR_COULDNOTPARSEJSONREQUEST 246
+#define LIBMC_ERROR_INVALIDCONTEXTUUID 247
+#define LIBMC_ERROR_INVALIDUPLOADNAME 248
+#define LIBMC_ERROR_INVALIDMIMETYPE 249
+#define LIBMC_ERROR_INVALIDSTREAMSIZE 250
+#define LIBMC_ERROR_INVALIDSHA256SUM 251
+#define LIBMC_ERROR_INVALIDSTREAMUUID 252
+#define LIBMC_ERROR_INVALIDFIELDNAME 253
+#define LIBMC_ERROR_UPLOADSIZEMISMATCH 254
+#define LIBMC_ERROR_CONTENTTYPENOTACCEPTED 255
+#define LIBMC_ERROR_NOCURRENTUPLOAD 256
+#define LIBMC_ERROR_UPLOADCHECKSUMMISMATCH 257
+#define LIBMC_ERROR_INVALIDSTORAGESTREAMSTATUS 258
+#define LIBMC_ERROR_CONTEXTUUIDNOTACCEPTED 259
+#define LIBMC_ERROR_INVALIDBUILDUUID 260
+#define LIBMC_ERROR_MISSINGTHREADCOUNT 261
+#define LIBMC_ERROR_INVALIDTHREADCOUNT 262
+#define LIBMC_ERROR_COULDNOTUPDATEBUILDSTATUS 263
+#define LIBMC_ERROR_INVALIDITERATOR 264
+#define LIBMC_ERROR_INVALIDDATATYPE 265
+#define LIBMC_ERROR_COULDNOTSENDSIGNAL 266
+#define LIBMC_ERROR_MISSINGSIGNALPARAMETER 267
+#define LIBMC_ERROR_NOUSERINTERFACEDEFINITION 268
+#define LIBMC_ERROR_MISSINGAPPNAME 269
+#define LIBMC_ERROR_MISSINGCOPYRIGHT 270
+#define LIBMC_ERROR_MISSINGMAINPAGE 271
+#define LIBMC_ERROR_MISSINGMENUITEMID 272
+#define LIBMC_ERROR_MISSINGMENUITEMICON 273
+#define LIBMC_ERROR_MISSINGMENUITEMCAPTION 274
+#define LIBMC_ERROR_MISSINGTARGETPAGE 275
+#define LIBMC_ERROR_MISSINGMENUNODE 276
+#define LIBMC_ERROR_MISSINGTOOLBARNODE 277
+#define LIBMC_ERROR_MISSINGTOOLBARITEMID 278
+#define LIBMC_ERROR_MISSINGTOOLBARITEMICON 279
+#define LIBMC_ERROR_MISSINGTOOLBARITEMCAPTION 280
+#define LIBMC_ERROR_MISSINGSERVICESNODE 281
 
 /*************************************************************************************************************************
  Error strings for LibMC
@@ -444,6 +484,46 @@ inline const char * LIBMC_GETERRORSTRING (LibMCResult nErrorCode) {
     case LIBMC_ERROR_DUPLICATESTORAGESTREAM: return "Duplicate Storage Stream";
     case LIBMC_ERROR_INVALIDPARTIALUPLOAD: return "Invalid Partial Upload";
     case LIBMC_ERROR_PARTIALUPLOADNOTFINISHED: return "Partial Upload not finished";
+    case LIBMC_ERROR_APIREQUESTNOTHANDLED: return "API Request not handled";
+    case LIBMC_ERROR_APIREQUESTALREADYHANDLED: return "API Request already handled";
+    case LIBMC_ERROR_INVALIDAPIREQUESTTYPE: return "Invalid API Request type";
+    case LIBMC_ERROR_INVALIDUPLOADSTREAM: return "Invalid Upload Stream";
+    case LIBMC_ERROR_COULDNOTPARSEJSONREQUEST: return "Could not parse JSON request";
+    case LIBMC_ERROR_INVALIDCONTEXTUUID: return "Invalid Context UUID";
+    case LIBMC_ERROR_INVALIDUPLOADNAME: return "Invalid Upload Name";
+    case LIBMC_ERROR_INVALIDMIMETYPE: return "Invalid Mime Type";
+    case LIBMC_ERROR_INVALIDSTREAMSIZE: return "Invalid Stream Size";
+    case LIBMC_ERROR_INVALIDSHA256SUM: return "Invalid SHA256 Sum";
+    case LIBMC_ERROR_INVALIDSTREAMUUID: return "Invalid Stream UUID";
+    case LIBMC_ERROR_INVALIDFIELDNAME: return "Invalid field name";
+    case LIBMC_ERROR_UPLOADSIZEMISMATCH: return "Upload size mismatch";
+    case LIBMC_ERROR_CONTENTTYPENOTACCEPTED: return "Content type not accepted";
+    case LIBMC_ERROR_NOCURRENTUPLOAD: return "No current upload";
+    case LIBMC_ERROR_UPLOADCHECKSUMMISMATCH: return "Upload checksum mismatch";
+    case LIBMC_ERROR_INVALIDSTORAGESTREAMSTATUS: return "Invalid storage stream status";
+    case LIBMC_ERROR_CONTEXTUUIDNOTACCEPTED: return "Context uuid not accepted";
+    case LIBMC_ERROR_INVALIDBUILDUUID: return "Invalid build uuid";
+    case LIBMC_ERROR_MISSINGTHREADCOUNT: return "Missing thread count";
+    case LIBMC_ERROR_INVALIDTHREADCOUNT: return "Invalid thread count";
+    case LIBMC_ERROR_COULDNOTUPDATEBUILDSTATUS: return "Could not update build status";
+    case LIBMC_ERROR_INVALIDITERATOR: return "Invalid iterator";
+    case LIBMC_ERROR_INVALIDDATATYPE: return "Invalid data type";
+    case LIBMC_ERROR_COULDNOTSENDSIGNAL: return "Could not send signal";
+    case LIBMC_ERROR_MISSINGSIGNALPARAMETER: return "Missing signal parameter";
+    case LIBMC_ERROR_NOUSERINTERFACEDEFINITION: return "No user interface definition";
+    case LIBMC_ERROR_MISSINGAPPNAME: return "Missing app name";
+    case LIBMC_ERROR_MISSINGCOPYRIGHT: return "Missing copyright";
+    case LIBMC_ERROR_MISSINGMAINPAGE: return "Missing main page";
+    case LIBMC_ERROR_MISSINGMENUITEMID: return "Missing menu item id";
+    case LIBMC_ERROR_MISSINGMENUITEMICON: return "Missing menu item icon";
+    case LIBMC_ERROR_MISSINGMENUITEMCAPTION: return "Missing menu item caption";
+    case LIBMC_ERROR_MISSINGTARGETPAGE: return "Missing menu item target page";
+    case LIBMC_ERROR_MISSINGMENUNODE: return "Missing menu node";
+    case LIBMC_ERROR_MISSINGTOOLBARNODE: return "Missing toolbar node";
+    case LIBMC_ERROR_MISSINGTOOLBARITEMID: return "Missing toolbar item id";
+    case LIBMC_ERROR_MISSINGTOOLBARITEMICON: return "Missing toolbar item icon";
+    case LIBMC_ERROR_MISSINGTOOLBARITEMCAPTION: return "Missing toolbar item caption";
+    case LIBMC_ERROR_MISSINGSERVICESNODE: return "Missing services node";
     default: return "unknown error";
   }
 }
@@ -453,7 +533,7 @@ inline const char * LIBMC_GETERRORSTRING (LibMCResult nErrorCode) {
 **************************************************************************************************************************/
 
 typedef LibMCHandle LibMC_Base;
-typedef LibMCHandle LibMC_APIResponse;
+typedef LibMCHandle LibMC_APIRequestHandler;
 typedef LibMCHandle LibMC_MCContext;
 
 namespace LibMC {
diff --git a/Framework/InterfacesCore/libmcdata_abi.hpp b/Framework/InterfacesCore/libmcdata_abi.hpp
index 5a27f161..4876897a 100644
--- a/Framework/InterfacesCore/libmcdata_abi.hpp
+++ b/Framework/InterfacesCore/libmcdata_abi.hpp
@@ -140,17 +140,6 @@ LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_logsession_addentry(LibMCData_LogSe
 */
 LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_storagestream_getuuid(LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nUUIDBufferSize, LibMCData_uint32* pUUIDNeededChars, char * pUUIDBuffer);
 
-/**
-* returns the context uuid of a storage stream. Context might be for example a project uuid that this stream is part of.
-*
-* @param[in] pStorageStream - StorageStream instance.
-* @param[in] nContextUUIDBufferSize - size of the buffer (including trailing 0)
-* @param[out] pContextUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
-* @param[out] pContextUUIDBuffer -  buffer of UUID String, may be NULL
-* @return error code or 0 (success)
-*/
-LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_storagestream_getcontextuuid(LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nContextUUIDBufferSize, LibMCData_uint32* pContextUUIDNeededChars, char * pContextUUIDBuffer);
-
 /**
 * returns the timestamp of a storage stream.
 *
@@ -301,6 +290,93 @@ LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_storage_storepartialstream(LibMCDat
 */
 LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_storage_finishpartialstream(LibMCData_Storage pStorage, const char * pUUID);
 
+/**
+* Returns the maximum stream size that the data model allows.
+*
+* @param[in] pStorage - Storage instance.
+* @param[out] pMaxStreamSize - Maximum Stream Size in Bytes.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_storage_getmaxstreamsize(LibMCData_Storage pStorage, LibMCData_uint64 * pMaxStreamSize);
+
+/**
+* Returns if the given content type is an acceptable value.
+*
+* @param[in] pStorage - Storage instance.
+* @param[in] pContentType - Content type string (is taken case-insensitive)
+* @param[out] pAccepted - Content type is accepted.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_storage_contenttypeisaccepted(LibMCData_Storage pStorage, const char * pContentType, bool * pAccepted);
+
+/*************************************************************************************************************************
+ Class definition for BuildJobData
+**************************************************************************************************************************/
+
+/**
+* returns the name of a build job.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name String, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobdata_getname(LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nNameBufferSize, LibMCData_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* returns the timestamp when the job was created.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[in] nTimestampBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTimestampNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTimestampBuffer -  buffer of Timestamp in ISO8601 UTC format, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobdata_gettimestamp(LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nTimestampBufferSize, LibMCData_uint32* pTimestampNeededChars, char * pTimestampBuffer);
+
+/**
+* returns the storage stream of the build.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[out] pStreamInstance - Stream Instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobdata_getstoragestream(LibMCData_BuildJobData pBuildJobData, LibMCData_StorageStream * pStreamInstance);
+
+/**
+* returns the data type of the job data.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[out] pDataType - Data type of the job data
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobdata_getdatatype(LibMCData_BuildJobData pBuildJobData, LibMCData::eBuildJobDataType * pDataType);
+
+/**
+* returns the mime type of a storage stream.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[in] nMimeTypeBufferSize - size of the buffer (including trailing 0)
+* @param[out] pMimeTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pMimeTypeBuffer -  buffer of Mime Type String, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobdata_getmimetype(LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nMimeTypeBufferSize, LibMCData_uint32* pMimeTypeNeededChars, char * pMimeTypeBuffer);
+
+/*************************************************************************************************************************
+ Class definition for BuildJobDataIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the build job data the iterator points at.
+*
+* @param[in] pBuildJobDataIterator - BuildJobDataIterator instance.
+* @param[out] pCurrentInstance - returns the build job instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobdataiterator_getcurrentjobdata(LibMCData_BuildJobDataIterator pBuildJobDataIterator, LibMCData_BuildJobData * pCurrentInstance);
+
 /*************************************************************************************************************************
  Class definition for BuildJob
 **************************************************************************************************************************/
@@ -336,6 +412,15 @@ LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_getname(LibMCData_BuildJob
 */
 LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_getstatus(LibMCData_BuildJob pBuildJob, LibMCData::eBuildJobStatus * pStatus);
 
+/**
+* returns the layer count of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pLayerCount - Layer Count of build job
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_getlayercount(LibMCData_BuildJob pBuildJob, LibMCData_uint32 * pLayerCount);
+
 /**
 * returns the timestamp when the job was created.
 *
@@ -356,6 +441,17 @@ LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_gettimestamp(LibMCData_Bui
 */
 LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_getstoragestream(LibMCData_BuildJob pBuildJob, LibMCData_StorageStream * pStreamInstance);
 
+/**
+* returns the storage stream uuid of the build.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] nStreamUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pStreamUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pStreamUUIDBuffer -  buffer of Stream UUID., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_getstoragestreamuuid(LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nStreamUUIDBufferSize, LibMCData_uint32* pStreamUUIDNeededChars, char * pStreamUUIDBuffer);
+
 /**
 * creates a build job log session access class.
 *
@@ -365,6 +461,87 @@ LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_getstoragestream(LibMCData
 */
 LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_getbuildjoblogger(LibMCData_BuildJob pBuildJob, LibMCData_LogSession * pLogSession);
 
+/**
+* Starts validation of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_startvalidating(LibMCData_BuildJob pBuildJob);
+
+/**
+* Finishes validation of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] nLayerCount - Layer count
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_finishvalidating(LibMCData_BuildJob pBuildJob, LibMCData_uint32 nLayerCount);
+
+/**
+* Archives a Job. Job MUST not be opened in the system. Job MUST be of state validated.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_archivejob(LibMCData_BuildJob pBuildJob);
+
+/**
+* Unarchives a Job. Job MUST be of state archived.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_unarchivejob(LibMCData_BuildJob pBuildJob);
+
+/**
+* Deletes a Job permanently including all referencing data objects. Job MUST be of state archived to succeed.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_deletejob(LibMCData_BuildJob pBuildJob);
+
+/**
+* Returns if a job is opened.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pCanBeArchived - returns if the job can be archived.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_jobcanbearchived(LibMCData_BuildJob pBuildJob, bool * pCanBeArchived);
+
+/**
+* Adds additional data to the Job. Job MUST be of state validated in order to add job data.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] pName - Name of the job
+* @param[in] pStream - Storage Stream Instance
+* @param[in] eDataType - Datatype of Job data
+* @param[in] pUserID - Currently authenticated user
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_addjobdata(LibMCData_BuildJob pBuildJob, const char * pName, LibMCData_StorageStream pStream, LibMCData::eBuildJobDataType eDataType, const char * pUserID);
+
+/**
+* Retrieves a list of build job data objects, filtered by type.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] eDataType - Datatype of Job data.
+* @param[out] pIteratorInstance - Build Job Data Iterator Instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_listjobdatabytype(LibMCData_BuildJob pBuildJob, LibMCData::eBuildJobDataType eDataType, LibMCData_BuildJobDataIterator * pIteratorInstance);
+
+/**
+* Retrieves a list of build job data objects.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pIteratorInstance - Build Job Data Iterator Instance.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjob_listjobdata(LibMCData_BuildJob pBuildJob, LibMCData_BuildJobDataIterator * pIteratorInstance);
+
 /*************************************************************************************************************************
  Class definition for BuildJobIterator
 **************************************************************************************************************************/
@@ -389,11 +566,11 @@ LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobiterator_getcurrentjob(LibM
 * @param[in] pJobUUID - UUID String for the build job. Must be unique and newly generated.
 * @param[in] pName - Name String
 * @param[in] pUserID - Currently authenticated user
-* @param[in] pStreamInstance - Storage stream to create the job from. ContextUUID of Stream MUST be the Job UUID.
+* @param[in] pStorageStreamUUID - Storage stream uuid for the job. Needs not exist yet.
 * @param[out] pJobInstance - Build Job Instance.
 * @return error code or 0 (success)
 */
-LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobhandler_createjob(LibMCData_BuildJobHandler pBuildJobHandler, const char * pJobUUID, const char * pName, const char * pUserID, LibMCData_StorageStream pStreamInstance, LibMCData_BuildJob * pJobInstance);
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_buildjobhandler_createjob(LibMCData_BuildJobHandler pBuildJobHandler, const char * pJobUUID, const char * pName, const char * pUserID, const char * pStorageStreamUUID, LibMCData_BuildJob * pJobInstance);
 
 /**
 * Retrieves a job with a specific UUID.
diff --git a/Framework/InterfacesCore/libmcdata_interfaces.hpp b/Framework/InterfacesCore/libmcdata_interfaces.hpp
index cfb47fb1..27a1e2b4 100644
--- a/Framework/InterfacesCore/libmcdata_interfaces.hpp
+++ b/Framework/InterfacesCore/libmcdata_interfaces.hpp
@@ -59,6 +59,8 @@ class IIterator;
 class ILogSession;
 class IStorageStream;
 class IStorage;
+class IBuildJobData;
+class IBuildJobDataIterator;
 class IBuildJob;
 class IBuildJobIterator;
 class IBuildJobHandler;
@@ -316,12 +318,6 @@ class IStorageStream : public virtual IBase {
 	*/
 	virtual std::string GetUUID() = 0;
 
-	/**
-	* IStorageStream::GetContextUUID - returns the context uuid of a storage stream. Context might be for example a project uuid that this stream is part of.
-	* @return UUID String
-	*/
-	virtual std::string GetContextUUID() = 0;
-
 	/**
 	* IStorageStream::GetTimeStamp - returns the timestamp of a storage stream.
 	* @return Timestamp in ISO8601 UTC format
@@ -432,11 +428,82 @@ class IStorage : public virtual IBase {
 	*/
 	virtual void FinishPartialStream(const std::string & sUUID) = 0;
 
+	/**
+	* IStorage::GetMaxStreamSize - Returns the maximum stream size that the data model allows.
+	* @return Maximum Stream Size in Bytes.
+	*/
+	virtual LibMCData_uint64 GetMaxStreamSize() = 0;
+
+	/**
+	* IStorage::ContentTypeIsAccepted - Returns if the given content type is an acceptable value.
+	* @param[in] sContentType - Content type string (is taken case-insensitive)
+	* @return Content type is accepted.
+	*/
+	virtual bool ContentTypeIsAccepted(const std::string & sContentType) = 0;
+
 };
 
 typedef IBaseSharedPtr<IStorage> PIStorage;
 
 
+/*************************************************************************************************************************
+ Class interface for BuildJobData 
+**************************************************************************************************************************/
+
+class IBuildJobData : public virtual IBase {
+public:
+	/**
+	* IBuildJobData::GetName - returns the name of a build job.
+	* @return Name String
+	*/
+	virtual std::string GetName() = 0;
+
+	/**
+	* IBuildJobData::GetTimeStamp - returns the timestamp when the job was created.
+	* @return Timestamp in ISO8601 UTC format
+	*/
+	virtual std::string GetTimeStamp() = 0;
+
+	/**
+	* IBuildJobData::GetStorageStream - returns the storage stream of the build.
+	* @return Stream Instance.
+	*/
+	virtual IStorageStream * GetStorageStream() = 0;
+
+	/**
+	* IBuildJobData::GetDataType - returns the data type of the job data.
+	* @return Data type of the job data
+	*/
+	virtual LibMCData::eBuildJobDataType GetDataType() = 0;
+
+	/**
+	* IBuildJobData::GetMIMEType - returns the mime type of a storage stream.
+	* @return Mime Type String
+	*/
+	virtual std::string GetMIMEType() = 0;
+
+};
+
+typedef IBaseSharedPtr<IBuildJobData> PIBuildJobData;
+
+
+/*************************************************************************************************************************
+ Class interface for BuildJobDataIterator 
+**************************************************************************************************************************/
+
+class IBuildJobDataIterator : public virtual IIterator {
+public:
+	/**
+	* IBuildJobDataIterator::GetCurrentJobData - Returns the build job data the iterator points at.
+	* @return returns the build job instance.
+	*/
+	virtual IBuildJobData * GetCurrentJobData() = 0;
+
+};
+
+typedef IBaseSharedPtr<IBuildJobDataIterator> PIBuildJobDataIterator;
+
+
 /*************************************************************************************************************************
  Class interface for BuildJob 
 **************************************************************************************************************************/
@@ -461,6 +528,12 @@ class IBuildJob : public virtual IBase {
 	*/
 	virtual LibMCData::eBuildJobStatus GetStatus() = 0;
 
+	/**
+	* IBuildJob::GetLayerCount - returns the layer count of a build job.
+	* @return Layer Count of build job
+	*/
+	virtual LibMCData_uint32 GetLayerCount() = 0;
+
 	/**
 	* IBuildJob::GetTimeStamp - returns the timestamp when the job was created.
 	* @return Timestamp in ISO8601 UTC format
@@ -473,12 +546,72 @@ class IBuildJob : public virtual IBase {
 	*/
 	virtual IStorageStream * GetStorageStream() = 0;
 
+	/**
+	* IBuildJob::GetStorageStreamUUID - returns the storage stream uuid of the build.
+	* @return Stream UUID.
+	*/
+	virtual std::string GetStorageStreamUUID() = 0;
+
 	/**
 	* IBuildJob::GetBuildJobLogger - creates a build job log session access class.
 	* @return LogSession class instance.
 	*/
 	virtual ILogSession * GetBuildJobLogger() = 0;
 
+	/**
+	* IBuildJob::StartValidating - Starts validation of a build job.
+	*/
+	virtual void StartValidating() = 0;
+
+	/**
+	* IBuildJob::FinishValidating - Finishes validation of a build job.
+	* @param[in] nLayerCount - Layer count
+	*/
+	virtual void FinishValidating(const LibMCData_uint32 nLayerCount) = 0;
+
+	/**
+	* IBuildJob::ArchiveJob - Archives a Job. Job MUST not be opened in the system. Job MUST be of state validated.
+	*/
+	virtual void ArchiveJob() = 0;
+
+	/**
+	* IBuildJob::UnArchiveJob - Unarchives a Job. Job MUST be of state archived.
+	*/
+	virtual void UnArchiveJob() = 0;
+
+	/**
+	* IBuildJob::DeleteJob - Deletes a Job permanently including all referencing data objects. Job MUST be of state archived to succeed.
+	*/
+	virtual void DeleteJob() = 0;
+
+	/**
+	* IBuildJob::JobCanBeArchived - Returns if a job is opened.
+	* @return returns if the job can be archived.
+	*/
+	virtual bool JobCanBeArchived() = 0;
+
+	/**
+	* IBuildJob::AddJobData - Adds additional data to the Job. Job MUST be of state validated in order to add job data.
+	* @param[in] sName - Name of the job
+	* @param[in] pStream - Storage Stream Instance
+	* @param[in] eDataType - Datatype of Job data
+	* @param[in] sUserID - Currently authenticated user
+	*/
+	virtual void AddJobData(const std::string & sName, IStorageStream* pStream, const LibMCData::eBuildJobDataType eDataType, const std::string & sUserID) = 0;
+
+	/**
+	* IBuildJob::ListJobDataByType - Retrieves a list of build job data objects, filtered by type.
+	* @param[in] eDataType - Datatype of Job data.
+	* @return Build Job Data Iterator Instance.
+	*/
+	virtual IBuildJobDataIterator * ListJobDataByType(const LibMCData::eBuildJobDataType eDataType) = 0;
+
+	/**
+	* IBuildJob::ListJobData - Retrieves a list of build job data objects.
+	* @return Build Job Data Iterator Instance.
+	*/
+	virtual IBuildJobDataIterator * ListJobData() = 0;
+
 };
 
 typedef IBaseSharedPtr<IBuildJob> PIBuildJob;
@@ -512,10 +645,10 @@ class IBuildJobHandler : public virtual IBase {
 	* @param[in] sJobUUID - UUID String for the build job. Must be unique and newly generated.
 	* @param[in] sName - Name String
 	* @param[in] sUserID - Currently authenticated user
-	* @param[in] pStreamInstance - Storage stream to create the job from. ContextUUID of Stream MUST be the Job UUID.
+	* @param[in] sStorageStreamUUID - Storage stream uuid for the job. Needs not exist yet.
 	* @return Build Job Instance.
 	*/
-	virtual IBuildJob * CreateJob(const std::string & sJobUUID, const std::string & sName, const std::string & sUserID, IStorageStream* pStreamInstance) = 0;
+	virtual IBuildJob * CreateJob(const std::string & sJobUUID, const std::string & sName, const std::string & sUserID, const std::string & sStorageStreamUUID) = 0;
 
 	/**
 	* IBuildJobHandler::RetrieveJob - Retrieves a job with a specific UUID.
diff --git a/Framework/InterfacesCore/libmcdata_interfacewrapper.cpp b/Framework/InterfacesCore/libmcdata_interfacewrapper.cpp
index 381900b8..dc05a0f8 100644
--- a/Framework/InterfacesCore/libmcdata_interfacewrapper.cpp
+++ b/Framework/InterfacesCore/libmcdata_interfacewrapper.cpp
@@ -306,54 +306,6 @@ LibMCDataResult libmcdata_storagestream_getuuid(LibMCData_StorageStream pStorage
 	}
 }
 
-LibMCDataResult libmcdata_storagestream_getcontextuuid(LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nContextUUIDBufferSize, LibMCData_uint32* pContextUUIDNeededChars, char * pContextUUIDBuffer)
-{
-	IBase* pIBaseClass = (IBase *)pStorageStream;
-
-	try {
-		if ( (!pContextUUIDBuffer) && !(pContextUUIDNeededChars) )
-			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
-		std::string sContextUUID("");
-		IStorageStream* pIStorageStream = dynamic_cast<IStorageStream*>(pIBaseClass);
-		if (!pIStorageStream)
-			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
-		
-		bool isCacheCall = (pContextUUIDBuffer == nullptr);
-		if (isCacheCall) {
-			sContextUUID = pIStorageStream->GetContextUUID();
-
-			pIStorageStream->_setCache (new ParameterCache_1<std::string> (sContextUUID));
-		}
-		else {
-			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIStorageStream->_getCache ());
-			if (cache == nullptr)
-				throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
-			cache->retrieveData (sContextUUID);
-			pIStorageStream->_setCache (nullptr);
-		}
-		
-		if (pContextUUIDNeededChars)
-			*pContextUUIDNeededChars = (LibMCData_uint32) (sContextUUID.size()+1);
-		if (pContextUUIDBuffer) {
-			if (sContextUUID.size() >= nContextUUIDBufferSize)
-				throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_BUFFERTOOSMALL);
-			for (size_t iContextUUID = 0; iContextUUID < sContextUUID.size(); iContextUUID++)
-				pContextUUIDBuffer[iContextUUID] = sContextUUID[iContextUUID];
-			pContextUUIDBuffer[sContextUUID.size()] = 0;
-		}
-		return LIBMCDATA_SUCCESS;
-	}
-	catch (ELibMCDataInterfaceException & Exception) {
-		return handleLibMCDataException(pIBaseClass, Exception);
-	}
-	catch (std::exception & StdException) {
-		return handleStdException(pIBaseClass, StdException);
-	}
-	catch (...) {
-		return handleUnhandledException(pIBaseClass);
-	}
-}
-
 LibMCDataResult libmcdata_storagestream_gettimestamp(LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nTimestampBufferSize, LibMCData_uint32* pTimestampNeededChars, char * pTimestampBuffer)
 {
 	IBase* pIBaseClass = (IBase *)pStorageStream;
@@ -831,45 +783,48 @@ LibMCDataResult libmcdata_storage_finishpartialstream(LibMCData_Storage pStorage
 	}
 }
 
-
-/*************************************************************************************************************************
- Class implementation for BuildJob
-**************************************************************************************************************************/
-LibMCDataResult libmcdata_buildjob_getuuid(LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nUUIDBufferSize, LibMCData_uint32* pUUIDNeededChars, char * pUUIDBuffer)
+LibMCDataResult libmcdata_storage_getmaxstreamsize(LibMCData_Storage pStorage, LibMCData_uint64 * pMaxStreamSize)
 {
-	IBase* pIBaseClass = (IBase *)pBuildJob;
+	IBase* pIBaseClass = (IBase *)pStorage;
 
 	try {
-		if ( (!pUUIDBuffer) && !(pUUIDNeededChars) )
+		if (pMaxStreamSize == nullptr)
 			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
-		std::string sUUID("");
-		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
-		if (!pIBuildJob)
+		IStorage* pIStorage = dynamic_cast<IStorage*>(pIBaseClass);
+		if (!pIStorage)
 			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
 		
-		bool isCacheCall = (pUUIDBuffer == nullptr);
-		if (isCacheCall) {
-			sUUID = pIBuildJob->GetUUID();
+		*pMaxStreamSize = pIStorage->GetMaxStreamSize();
 
-			pIBuildJob->_setCache (new ParameterCache_1<std::string> (sUUID));
-		}
-		else {
-			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuildJob->_getCache ());
-			if (cache == nullptr)
-				throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
-			cache->retrieveData (sUUID);
-			pIBuildJob->_setCache (nullptr);
-		}
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_storage_contenttypeisaccepted(LibMCData_Storage pStorage, const char * pContentType, bool * pAccepted)
+{
+	IBase* pIBaseClass = (IBase *)pStorage;
+
+	try {
+		if (pContentType == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		if (pAccepted == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		std::string sContentType(pContentType);
+		IStorage* pIStorage = dynamic_cast<IStorage*>(pIBaseClass);
+		if (!pIStorage)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
 		
-		if (pUUIDNeededChars)
-			*pUUIDNeededChars = (LibMCData_uint32) (sUUID.size()+1);
-		if (pUUIDBuffer) {
-			if (sUUID.size() >= nUUIDBufferSize)
-				throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_BUFFERTOOSMALL);
-			for (size_t iUUID = 0; iUUID < sUUID.size(); iUUID++)
-				pUUIDBuffer[iUUID] = sUUID[iUUID];
-			pUUIDBuffer[sUUID.size()] = 0;
-		}
+		*pAccepted = pIStorage->ContentTypeIsAccepted(sContentType);
+
 		return LIBMCDATA_SUCCESS;
 	}
 	catch (ELibMCDataInterfaceException & Exception) {
@@ -883,30 +838,34 @@ LibMCDataResult libmcdata_buildjob_getuuid(LibMCData_BuildJob pBuildJob, const L
 	}
 }
 
-LibMCDataResult libmcdata_buildjob_getname(LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nNameBufferSize, LibMCData_uint32* pNameNeededChars, char * pNameBuffer)
+
+/*************************************************************************************************************************
+ Class implementation for BuildJobData
+**************************************************************************************************************************/
+LibMCDataResult libmcdata_buildjobdata_getname(LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nNameBufferSize, LibMCData_uint32* pNameNeededChars, char * pNameBuffer)
 {
-	IBase* pIBaseClass = (IBase *)pBuildJob;
+	IBase* pIBaseClass = (IBase *)pBuildJobData;
 
 	try {
 		if ( (!pNameBuffer) && !(pNameNeededChars) )
 			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
 		std::string sName("");
-		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
-		if (!pIBuildJob)
+		IBuildJobData* pIBuildJobData = dynamic_cast<IBuildJobData*>(pIBaseClass);
+		if (!pIBuildJobData)
 			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
 		
 		bool isCacheCall = (pNameBuffer == nullptr);
 		if (isCacheCall) {
-			sName = pIBuildJob->GetName();
+			sName = pIBuildJobData->GetName();
 
-			pIBuildJob->_setCache (new ParameterCache_1<std::string> (sName));
+			pIBuildJobData->_setCache (new ParameterCache_1<std::string> (sName));
 		}
 		else {
-			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuildJob->_getCache ());
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuildJobData->_getCache ());
 			if (cache == nullptr)
 				throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
 			cache->retrieveData (sName);
-			pIBuildJob->_setCache (nullptr);
+			pIBuildJobData->_setCache (nullptr);
 		}
 		
 		if (pNameNeededChars)
@@ -931,56 +890,30 @@ LibMCDataResult libmcdata_buildjob_getname(LibMCData_BuildJob pBuildJob, const L
 	}
 }
 
-LibMCDataResult libmcdata_buildjob_getstatus(LibMCData_BuildJob pBuildJob, eLibMCDataBuildJobStatus * pStatus)
-{
-	IBase* pIBaseClass = (IBase *)pBuildJob;
-
-	try {
-		if (pStatus == nullptr)
-			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
-		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
-		if (!pIBuildJob)
-			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
-		
-		*pStatus = pIBuildJob->GetStatus();
-
-		return LIBMCDATA_SUCCESS;
-	}
-	catch (ELibMCDataInterfaceException & Exception) {
-		return handleLibMCDataException(pIBaseClass, Exception);
-	}
-	catch (std::exception & StdException) {
-		return handleStdException(pIBaseClass, StdException);
-	}
-	catch (...) {
-		return handleUnhandledException(pIBaseClass);
-	}
-}
-
-LibMCDataResult libmcdata_buildjob_gettimestamp(LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nTimestampBufferSize, LibMCData_uint32* pTimestampNeededChars, char * pTimestampBuffer)
+LibMCDataResult libmcdata_buildjobdata_gettimestamp(LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nTimestampBufferSize, LibMCData_uint32* pTimestampNeededChars, char * pTimestampBuffer)
 {
-	IBase* pIBaseClass = (IBase *)pBuildJob;
+	IBase* pIBaseClass = (IBase *)pBuildJobData;
 
 	try {
 		if ( (!pTimestampBuffer) && !(pTimestampNeededChars) )
 			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
 		std::string sTimestamp("");
-		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
-		if (!pIBuildJob)
+		IBuildJobData* pIBuildJobData = dynamic_cast<IBuildJobData*>(pIBaseClass);
+		if (!pIBuildJobData)
 			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
 		
 		bool isCacheCall = (pTimestampBuffer == nullptr);
 		if (isCacheCall) {
-			sTimestamp = pIBuildJob->GetTimeStamp();
+			sTimestamp = pIBuildJobData->GetTimeStamp();
 
-			pIBuildJob->_setCache (new ParameterCache_1<std::string> (sTimestamp));
+			pIBuildJobData->_setCache (new ParameterCache_1<std::string> (sTimestamp));
 		}
 		else {
-			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuildJob->_getCache ());
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuildJobData->_getCache ());
 			if (cache == nullptr)
 				throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
 			cache->retrieveData (sTimestamp);
-			pIBuildJob->_setCache (nullptr);
+			pIBuildJobData->_setCache (nullptr);
 		}
 		
 		if (pTimestampNeededChars)
@@ -1005,19 +938,19 @@ LibMCDataResult libmcdata_buildjob_gettimestamp(LibMCData_BuildJob pBuildJob, co
 	}
 }
 
-LibMCDataResult libmcdata_buildjob_getstoragestream(LibMCData_BuildJob pBuildJob, LibMCData_StorageStream * pStreamInstance)
+LibMCDataResult libmcdata_buildjobdata_getstoragestream(LibMCData_BuildJobData pBuildJobData, LibMCData_StorageStream * pStreamInstance)
 {
-	IBase* pIBaseClass = (IBase *)pBuildJob;
+	IBase* pIBaseClass = (IBase *)pBuildJobData;
 
 	try {
 		if (pStreamInstance == nullptr)
 			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
 		IBase* pBaseStreamInstance(nullptr);
-		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
-		if (!pIBuildJob)
+		IBuildJobData* pIBuildJobData = dynamic_cast<IBuildJobData*>(pIBaseClass);
+		if (!pIBuildJobData)
 			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
 		
-		pBaseStreamInstance = pIBuildJob->GetStorageStream();
+		pBaseStreamInstance = pIBuildJobData->GetStorageStream();
 
 		*pStreamInstance = (IBase*)(pBaseStreamInstance);
 		return LIBMCDATA_SUCCESS;
@@ -1033,21 +966,67 @@ LibMCDataResult libmcdata_buildjob_getstoragestream(LibMCData_BuildJob pBuildJob
 	}
 }
 
-LibMCDataResult libmcdata_buildjob_getbuildjoblogger(LibMCData_BuildJob pBuildJob, LibMCData_LogSession * pLogSession)
+LibMCDataResult libmcdata_buildjobdata_getdatatype(LibMCData_BuildJobData pBuildJobData, eLibMCDataBuildJobDataType * pDataType)
 {
-	IBase* pIBaseClass = (IBase *)pBuildJob;
+	IBase* pIBaseClass = (IBase *)pBuildJobData;
 
 	try {
-		if (pLogSession == nullptr)
+		if (pDataType == nullptr)
 			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
-		IBase* pBaseLogSession(nullptr);
-		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
-		if (!pIBuildJob)
+		IBuildJobData* pIBuildJobData = dynamic_cast<IBuildJobData*>(pIBaseClass);
+		if (!pIBuildJobData)
 			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
 		
-		pBaseLogSession = pIBuildJob->GetBuildJobLogger();
+		*pDataType = pIBuildJobData->GetDataType();
 
-		*pLogSession = (IBase*)(pBaseLogSession);
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjobdata_getmimetype(LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nMimeTypeBufferSize, LibMCData_uint32* pMimeTypeNeededChars, char * pMimeTypeBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJobData;
+
+	try {
+		if ( (!pMimeTypeBuffer) && !(pMimeTypeNeededChars) )
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		std::string sMimeType("");
+		IBuildJobData* pIBuildJobData = dynamic_cast<IBuildJobData*>(pIBaseClass);
+		if (!pIBuildJobData)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pMimeTypeBuffer == nullptr);
+		if (isCacheCall) {
+			sMimeType = pIBuildJobData->GetMIMEType();
+
+			pIBuildJobData->_setCache (new ParameterCache_1<std::string> (sMimeType));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuildJobData->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+			cache->retrieveData (sMimeType);
+			pIBuildJobData->_setCache (nullptr);
+		}
+		
+		if (pMimeTypeNeededChars)
+			*pMimeTypeNeededChars = (LibMCData_uint32) (sMimeType.size()+1);
+		if (pMimeTypeBuffer) {
+			if (sMimeType.size() >= nMimeTypeBufferSize)
+				throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_BUFFERTOOSMALL);
+			for (size_t iMimeType = 0; iMimeType < sMimeType.size(); iMimeType++)
+				pMimeTypeBuffer[iMimeType] = sMimeType[iMimeType];
+			pMimeTypeBuffer[sMimeType.size()] = 0;
+		}
 		return LIBMCDATA_SUCCESS;
 	}
 	catch (ELibMCDataInterfaceException & Exception) {
@@ -1063,21 +1042,21 @@ LibMCDataResult libmcdata_buildjob_getbuildjoblogger(LibMCData_BuildJob pBuildJo
 
 
 /*************************************************************************************************************************
- Class implementation for BuildJobIterator
+ Class implementation for BuildJobDataIterator
 **************************************************************************************************************************/
-LibMCDataResult libmcdata_buildjobiterator_getcurrentjob(LibMCData_BuildJobIterator pBuildJobIterator, LibMCData_BuildJob * pCurrentInstance)
+LibMCDataResult libmcdata_buildjobdataiterator_getcurrentjobdata(LibMCData_BuildJobDataIterator pBuildJobDataIterator, LibMCData_BuildJobData * pCurrentInstance)
 {
-	IBase* pIBaseClass = (IBase *)pBuildJobIterator;
+	IBase* pIBaseClass = (IBase *)pBuildJobDataIterator;
 
 	try {
 		if (pCurrentInstance == nullptr)
 			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
 		IBase* pBaseCurrentInstance(nullptr);
-		IBuildJobIterator* pIBuildJobIterator = dynamic_cast<IBuildJobIterator*>(pIBaseClass);
-		if (!pIBuildJobIterator)
+		IBuildJobDataIterator* pIBuildJobDataIterator = dynamic_cast<IBuildJobDataIterator*>(pIBaseClass);
+		if (!pIBuildJobDataIterator)
 			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
 		
-		pBaseCurrentInstance = pIBuildJobIterator->GetCurrentJob();
+		pBaseCurrentInstance = pIBuildJobDataIterator->GetCurrentJobData();
 
 		*pCurrentInstance = (IBase*)(pBaseCurrentInstance);
 		return LIBMCDATA_SUCCESS;
@@ -1095,35 +1074,606 @@ LibMCDataResult libmcdata_buildjobiterator_getcurrentjob(LibMCData_BuildJobItera
 
 
 /*************************************************************************************************************************
- Class implementation for BuildJobHandler
+ Class implementation for BuildJob
 **************************************************************************************************************************/
-LibMCDataResult libmcdata_buildjobhandler_createjob(LibMCData_BuildJobHandler pBuildJobHandler, const char * pJobUUID, const char * pName, const char * pUserID, LibMCData_StorageStream pStreamInstance, LibMCData_BuildJob * pJobInstance)
+LibMCDataResult libmcdata_buildjob_getuuid(LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nUUIDBufferSize, LibMCData_uint32* pUUIDNeededChars, char * pUUIDBuffer)
 {
-	IBase* pIBaseClass = (IBase *)pBuildJobHandler;
+	IBase* pIBaseClass = (IBase *)pBuildJob;
 
 	try {
-		if (pJobUUID == nullptr)
-			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
-		if (pName == nullptr)
-			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
-		if (pUserID == nullptr)
-			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
-		if (pJobInstance == nullptr)
+		if ( (!pUUIDBuffer) && !(pUUIDNeededChars) )
 			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
-		std::string sJobUUID(pJobUUID);
-		std::string sName(pName);
-		std::string sUserID(pUserID);
-		IBase* pIBaseClassStreamInstance = (IBase *)pStreamInstance;
-		IStorageStream* pIStreamInstance = dynamic_cast<IStorageStream*>(pIBaseClassStreamInstance);
-		if (!pIStreamInstance)
-			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDCAST);
+		std::string sUUID("");
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pUUIDBuffer == nullptr);
+		if (isCacheCall) {
+			sUUID = pIBuildJob->GetUUID();
+
+			pIBuildJob->_setCache (new ParameterCache_1<std::string> (sUUID));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuildJob->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+			cache->retrieveData (sUUID);
+			pIBuildJob->_setCache (nullptr);
+		}
 		
+		if (pUUIDNeededChars)
+			*pUUIDNeededChars = (LibMCData_uint32) (sUUID.size()+1);
+		if (pUUIDBuffer) {
+			if (sUUID.size() >= nUUIDBufferSize)
+				throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_BUFFERTOOSMALL);
+			for (size_t iUUID = 0; iUUID < sUUID.size(); iUUID++)
+				pUUIDBuffer[iUUID] = sUUID[iUUID];
+			pUUIDBuffer[sUUID.size()] = 0;
+		}
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_getname(LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nNameBufferSize, LibMCData_uint32* pNameNeededChars, char * pNameBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		if ( (!pNameBuffer) && !(pNameNeededChars) )
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		std::string sName("");
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pNameBuffer == nullptr);
+		if (isCacheCall) {
+			sName = pIBuildJob->GetName();
+
+			pIBuildJob->_setCache (new ParameterCache_1<std::string> (sName));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuildJob->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+			cache->retrieveData (sName);
+			pIBuildJob->_setCache (nullptr);
+		}
+		
+		if (pNameNeededChars)
+			*pNameNeededChars = (LibMCData_uint32) (sName.size()+1);
+		if (pNameBuffer) {
+			if (sName.size() >= nNameBufferSize)
+				throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_BUFFERTOOSMALL);
+			for (size_t iName = 0; iName < sName.size(); iName++)
+				pNameBuffer[iName] = sName[iName];
+			pNameBuffer[sName.size()] = 0;
+		}
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_getstatus(LibMCData_BuildJob pBuildJob, eLibMCDataBuildJobStatus * pStatus)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		if (pStatus == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		*pStatus = pIBuildJob->GetStatus();
+
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_getlayercount(LibMCData_BuildJob pBuildJob, LibMCData_uint32 * pLayerCount)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		if (pLayerCount == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		*pLayerCount = pIBuildJob->GetLayerCount();
+
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_gettimestamp(LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nTimestampBufferSize, LibMCData_uint32* pTimestampNeededChars, char * pTimestampBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		if ( (!pTimestampBuffer) && !(pTimestampNeededChars) )
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		std::string sTimestamp("");
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pTimestampBuffer == nullptr);
+		if (isCacheCall) {
+			sTimestamp = pIBuildJob->GetTimeStamp();
+
+			pIBuildJob->_setCache (new ParameterCache_1<std::string> (sTimestamp));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuildJob->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+			cache->retrieveData (sTimestamp);
+			pIBuildJob->_setCache (nullptr);
+		}
+		
+		if (pTimestampNeededChars)
+			*pTimestampNeededChars = (LibMCData_uint32) (sTimestamp.size()+1);
+		if (pTimestampBuffer) {
+			if (sTimestamp.size() >= nTimestampBufferSize)
+				throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_BUFFERTOOSMALL);
+			for (size_t iTimestamp = 0; iTimestamp < sTimestamp.size(); iTimestamp++)
+				pTimestampBuffer[iTimestamp] = sTimestamp[iTimestamp];
+			pTimestampBuffer[sTimestamp.size()] = 0;
+		}
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_getstoragestream(LibMCData_BuildJob pBuildJob, LibMCData_StorageStream * pStreamInstance)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		if (pStreamInstance == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		IBase* pBaseStreamInstance(nullptr);
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		pBaseStreamInstance = pIBuildJob->GetStorageStream();
+
+		*pStreamInstance = (IBase*)(pBaseStreamInstance);
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_getstoragestreamuuid(LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nStreamUUIDBufferSize, LibMCData_uint32* pStreamUUIDNeededChars, char * pStreamUUIDBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		if ( (!pStreamUUIDBuffer) && !(pStreamUUIDNeededChars) )
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		std::string sStreamUUID("");
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pStreamUUIDBuffer == nullptr);
+		if (isCacheCall) {
+			sStreamUUID = pIBuildJob->GetStorageStreamUUID();
+
+			pIBuildJob->_setCache (new ParameterCache_1<std::string> (sStreamUUID));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuildJob->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+			cache->retrieveData (sStreamUUID);
+			pIBuildJob->_setCache (nullptr);
+		}
+		
+		if (pStreamUUIDNeededChars)
+			*pStreamUUIDNeededChars = (LibMCData_uint32) (sStreamUUID.size()+1);
+		if (pStreamUUIDBuffer) {
+			if (sStreamUUID.size() >= nStreamUUIDBufferSize)
+				throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_BUFFERTOOSMALL);
+			for (size_t iStreamUUID = 0; iStreamUUID < sStreamUUID.size(); iStreamUUID++)
+				pStreamUUIDBuffer[iStreamUUID] = sStreamUUID[iStreamUUID];
+			pStreamUUIDBuffer[sStreamUUID.size()] = 0;
+		}
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_getbuildjoblogger(LibMCData_BuildJob pBuildJob, LibMCData_LogSession * pLogSession)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		if (pLogSession == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		IBase* pBaseLogSession(nullptr);
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		pBaseLogSession = pIBuildJob->GetBuildJobLogger();
+
+		*pLogSession = (IBase*)(pBaseLogSession);
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_startvalidating(LibMCData_BuildJob pBuildJob)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		pIBuildJob->StartValidating();
+
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_finishvalidating(LibMCData_BuildJob pBuildJob, LibMCData_uint32 nLayerCount)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		pIBuildJob->FinishValidating(nLayerCount);
+
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_archivejob(LibMCData_BuildJob pBuildJob)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		pIBuildJob->ArchiveJob();
+
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_unarchivejob(LibMCData_BuildJob pBuildJob)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		pIBuildJob->UnArchiveJob();
+
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_deletejob(LibMCData_BuildJob pBuildJob)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		pIBuildJob->DeleteJob();
+
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_jobcanbearchived(LibMCData_BuildJob pBuildJob, bool * pCanBeArchived)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		if (pCanBeArchived == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		*pCanBeArchived = pIBuildJob->JobCanBeArchived();
+
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_addjobdata(LibMCData_BuildJob pBuildJob, const char * pName, LibMCData_StorageStream pStream, eLibMCDataBuildJobDataType eDataType, const char * pUserID)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		if (pName == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		if (pUserID == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		std::string sName(pName);
+		IBase* pIBaseClassStream = (IBase *)pStream;
+		IStorageStream* pIStream = dynamic_cast<IStorageStream*>(pIBaseClassStream);
+		if (!pIStream)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDCAST);
+		
+		std::string sUserID(pUserID);
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		pIBuildJob->AddJobData(sName, pIStream, eDataType, sUserID);
+
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_listjobdatabytype(LibMCData_BuildJob pBuildJob, eLibMCDataBuildJobDataType eDataType, LibMCData_BuildJobDataIterator * pIteratorInstance)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		if (pIteratorInstance == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		IBase* pBaseIteratorInstance(nullptr);
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		pBaseIteratorInstance = pIBuildJob->ListJobDataByType(eDataType);
+
+		*pIteratorInstance = (IBase*)(pBaseIteratorInstance);
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_buildjob_listjobdata(LibMCData_BuildJob pBuildJob, LibMCData_BuildJobDataIterator * pIteratorInstance)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJob;
+
+	try {
+		if (pIteratorInstance == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		IBase* pBaseIteratorInstance(nullptr);
+		IBuildJob* pIBuildJob = dynamic_cast<IBuildJob*>(pIBaseClass);
+		if (!pIBuildJob)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		pBaseIteratorInstance = pIBuildJob->ListJobData();
+
+		*pIteratorInstance = (IBase*)(pBaseIteratorInstance);
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for BuildJobIterator
+**************************************************************************************************************************/
+LibMCDataResult libmcdata_buildjobiterator_getcurrentjob(LibMCData_BuildJobIterator pBuildJobIterator, LibMCData_BuildJob * pCurrentInstance)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJobIterator;
+
+	try {
+		if (pCurrentInstance == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		IBase* pBaseCurrentInstance(nullptr);
+		IBuildJobIterator* pIBuildJobIterator = dynamic_cast<IBuildJobIterator*>(pIBaseClass);
+		if (!pIBuildJobIterator)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+		
+		pBaseCurrentInstance = pIBuildJobIterator->GetCurrentJob();
+
+		*pCurrentInstance = (IBase*)(pBaseCurrentInstance);
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for BuildJobHandler
+**************************************************************************************************************************/
+LibMCDataResult libmcdata_buildjobhandler_createjob(LibMCData_BuildJobHandler pBuildJobHandler, const char * pJobUUID, const char * pName, const char * pUserID, const char * pStorageStreamUUID, LibMCData_BuildJob * pJobInstance)
+{
+	IBase* pIBaseClass = (IBase *)pBuildJobHandler;
+
+	try {
+		if (pJobUUID == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		if (pName == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		if (pUserID == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		if (pStorageStreamUUID == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		if (pJobInstance == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		std::string sJobUUID(pJobUUID);
+		std::string sName(pName);
+		std::string sUserID(pUserID);
+		std::string sStorageStreamUUID(pStorageStreamUUID);
 		IBase* pBaseJobInstance(nullptr);
 		IBuildJobHandler* pIBuildJobHandler = dynamic_cast<IBuildJobHandler*>(pIBaseClass);
 		if (!pIBuildJobHandler)
 			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
 		
-		pBaseJobInstance = pIBuildJobHandler->CreateJob(sJobUUID, sName, sUserID, pIStreamInstance);
+		pBaseJobInstance = pIBuildJobHandler->CreateJob(sJobUUID, sName, sUserID, sStorageStreamUUID);
 
 		*pJobInstance = (IBase*)(pBaseJobInstance);
 		return LIBMCDATA_SUCCESS;
@@ -1448,8 +1998,6 @@ LibMCDataResult LibMCData::Impl::LibMCData_GetProcAddress (const char * pProcNam
 		*ppProcAddress = (void*) &libmcdata_logsession_addentry;
 	if (sProcName == "libmcdata_storagestream_getuuid") 
 		*ppProcAddress = (void*) &libmcdata_storagestream_getuuid;
-	if (sProcName == "libmcdata_storagestream_getcontextuuid") 
-		*ppProcAddress = (void*) &libmcdata_storagestream_getcontextuuid;
 	if (sProcName == "libmcdata_storagestream_gettimestamp") 
 		*ppProcAddress = (void*) &libmcdata_storagestream_gettimestamp;
 	if (sProcName == "libmcdata_storagestream_getname") 
@@ -1476,18 +2024,56 @@ LibMCDataResult LibMCData::Impl::LibMCData_GetProcAddress (const char * pProcNam
 		*ppProcAddress = (void*) &libmcdata_storage_storepartialstream;
 	if (sProcName == "libmcdata_storage_finishpartialstream") 
 		*ppProcAddress = (void*) &libmcdata_storage_finishpartialstream;
+	if (sProcName == "libmcdata_storage_getmaxstreamsize") 
+		*ppProcAddress = (void*) &libmcdata_storage_getmaxstreamsize;
+	if (sProcName == "libmcdata_storage_contenttypeisaccepted") 
+		*ppProcAddress = (void*) &libmcdata_storage_contenttypeisaccepted;
+	if (sProcName == "libmcdata_buildjobdata_getname") 
+		*ppProcAddress = (void*) &libmcdata_buildjobdata_getname;
+	if (sProcName == "libmcdata_buildjobdata_gettimestamp") 
+		*ppProcAddress = (void*) &libmcdata_buildjobdata_gettimestamp;
+	if (sProcName == "libmcdata_buildjobdata_getstoragestream") 
+		*ppProcAddress = (void*) &libmcdata_buildjobdata_getstoragestream;
+	if (sProcName == "libmcdata_buildjobdata_getdatatype") 
+		*ppProcAddress = (void*) &libmcdata_buildjobdata_getdatatype;
+	if (sProcName == "libmcdata_buildjobdata_getmimetype") 
+		*ppProcAddress = (void*) &libmcdata_buildjobdata_getmimetype;
+	if (sProcName == "libmcdata_buildjobdataiterator_getcurrentjobdata") 
+		*ppProcAddress = (void*) &libmcdata_buildjobdataiterator_getcurrentjobdata;
 	if (sProcName == "libmcdata_buildjob_getuuid") 
 		*ppProcAddress = (void*) &libmcdata_buildjob_getuuid;
 	if (sProcName == "libmcdata_buildjob_getname") 
 		*ppProcAddress = (void*) &libmcdata_buildjob_getname;
 	if (sProcName == "libmcdata_buildjob_getstatus") 
 		*ppProcAddress = (void*) &libmcdata_buildjob_getstatus;
+	if (sProcName == "libmcdata_buildjob_getlayercount") 
+		*ppProcAddress = (void*) &libmcdata_buildjob_getlayercount;
 	if (sProcName == "libmcdata_buildjob_gettimestamp") 
 		*ppProcAddress = (void*) &libmcdata_buildjob_gettimestamp;
 	if (sProcName == "libmcdata_buildjob_getstoragestream") 
 		*ppProcAddress = (void*) &libmcdata_buildjob_getstoragestream;
+	if (sProcName == "libmcdata_buildjob_getstoragestreamuuid") 
+		*ppProcAddress = (void*) &libmcdata_buildjob_getstoragestreamuuid;
 	if (sProcName == "libmcdata_buildjob_getbuildjoblogger") 
 		*ppProcAddress = (void*) &libmcdata_buildjob_getbuildjoblogger;
+	if (sProcName == "libmcdata_buildjob_startvalidating") 
+		*ppProcAddress = (void*) &libmcdata_buildjob_startvalidating;
+	if (sProcName == "libmcdata_buildjob_finishvalidating") 
+		*ppProcAddress = (void*) &libmcdata_buildjob_finishvalidating;
+	if (sProcName == "libmcdata_buildjob_archivejob") 
+		*ppProcAddress = (void*) &libmcdata_buildjob_archivejob;
+	if (sProcName == "libmcdata_buildjob_unarchivejob") 
+		*ppProcAddress = (void*) &libmcdata_buildjob_unarchivejob;
+	if (sProcName == "libmcdata_buildjob_deletejob") 
+		*ppProcAddress = (void*) &libmcdata_buildjob_deletejob;
+	if (sProcName == "libmcdata_buildjob_jobcanbearchived") 
+		*ppProcAddress = (void*) &libmcdata_buildjob_jobcanbearchived;
+	if (sProcName == "libmcdata_buildjob_addjobdata") 
+		*ppProcAddress = (void*) &libmcdata_buildjob_addjobdata;
+	if (sProcName == "libmcdata_buildjob_listjobdatabytype") 
+		*ppProcAddress = (void*) &libmcdata_buildjob_listjobdatabytype;
+	if (sProcName == "libmcdata_buildjob_listjobdata") 
+		*ppProcAddress = (void*) &libmcdata_buildjob_listjobdata;
 	if (sProcName == "libmcdata_buildjobiterator_getcurrentjob") 
 		*ppProcAddress = (void*) &libmcdata_buildjobiterator_getcurrentjob;
 	if (sProcName == "libmcdata_buildjobhandler_createjob") 
diff --git a/Framework/InterfacesCore/libmcdata_types.hpp b/Framework/InterfacesCore/libmcdata_types.hpp
index e520360a..f9936b8a 100644
--- a/Framework/InterfacesCore/libmcdata_types.hpp
+++ b/Framework/InterfacesCore/libmcdata_types.hpp
@@ -266,6 +266,46 @@ typedef void * LibMCData_pvoid;
 #define LIBMCDATA_ERROR_DUPLICATESTORAGESTREAM 239
 #define LIBMCDATA_ERROR_INVALIDPARTIALUPLOAD 240
 #define LIBMCDATA_ERROR_PARTIALUPLOADNOTFINISHED 241
+#define LIBMCDATA_ERROR_APIREQUESTNOTHANDLED 242
+#define LIBMCDATA_ERROR_APIREQUESTALREADYHANDLED 243
+#define LIBMCDATA_ERROR_INVALIDAPIREQUESTTYPE 244
+#define LIBMCDATA_ERROR_INVALIDUPLOADSTREAM 245
+#define LIBMCDATA_ERROR_COULDNOTPARSEJSONREQUEST 246
+#define LIBMCDATA_ERROR_INVALIDCONTEXTUUID 247
+#define LIBMCDATA_ERROR_INVALIDUPLOADNAME 248
+#define LIBMCDATA_ERROR_INVALIDMIMETYPE 249
+#define LIBMCDATA_ERROR_INVALIDSTREAMSIZE 250
+#define LIBMCDATA_ERROR_INVALIDSHA256SUM 251
+#define LIBMCDATA_ERROR_INVALIDSTREAMUUID 252
+#define LIBMCDATA_ERROR_INVALIDFIELDNAME 253
+#define LIBMCDATA_ERROR_UPLOADSIZEMISMATCH 254
+#define LIBMCDATA_ERROR_CONTENTTYPENOTACCEPTED 255
+#define LIBMCDATA_ERROR_NOCURRENTUPLOAD 256
+#define LIBMCDATA_ERROR_UPLOADCHECKSUMMISMATCH 257
+#define LIBMCDATA_ERROR_INVALIDSTORAGESTREAMSTATUS 258
+#define LIBMCDATA_ERROR_CONTEXTUUIDNOTACCEPTED 259
+#define LIBMCDATA_ERROR_INVALIDBUILDUUID 260
+#define LIBMCDATA_ERROR_MISSINGTHREADCOUNT 261
+#define LIBMCDATA_ERROR_INVALIDTHREADCOUNT 262
+#define LIBMCDATA_ERROR_COULDNOTUPDATEBUILDSTATUS 263
+#define LIBMCDATA_ERROR_INVALIDITERATOR 264
+#define LIBMCDATA_ERROR_INVALIDDATATYPE 265
+#define LIBMCDATA_ERROR_COULDNOTSENDSIGNAL 266
+#define LIBMCDATA_ERROR_MISSINGSIGNALPARAMETER 267
+#define LIBMCDATA_ERROR_NOUSERINTERFACEDEFINITION 268
+#define LIBMCDATA_ERROR_MISSINGAPPNAME 269
+#define LIBMCDATA_ERROR_MISSINGCOPYRIGHT 270
+#define LIBMCDATA_ERROR_MISSINGMAINPAGE 271
+#define LIBMCDATA_ERROR_MISSINGMENUITEMID 272
+#define LIBMCDATA_ERROR_MISSINGMENUITEMICON 273
+#define LIBMCDATA_ERROR_MISSINGMENUITEMCAPTION 274
+#define LIBMCDATA_ERROR_MISSINGTARGETPAGE 275
+#define LIBMCDATA_ERROR_MISSINGMENUNODE 276
+#define LIBMCDATA_ERROR_MISSINGTOOLBARNODE 277
+#define LIBMCDATA_ERROR_MISSINGTOOLBARITEMID 278
+#define LIBMCDATA_ERROR_MISSINGTOOLBARITEMICON 279
+#define LIBMCDATA_ERROR_MISSINGTOOLBARITEMCAPTION 280
+#define LIBMCDATA_ERROR_MISSINGSERVICESNODE 281
 
 /*************************************************************************************************************************
  Error strings for LibMCData
@@ -444,6 +484,46 @@ inline const char * LIBMCDATA_GETERRORSTRING (LibMCDataResult nErrorCode) {
     case LIBMCDATA_ERROR_DUPLICATESTORAGESTREAM: return "Duplicate Storage Stream";
     case LIBMCDATA_ERROR_INVALIDPARTIALUPLOAD: return "Invalid Partial Upload";
     case LIBMCDATA_ERROR_PARTIALUPLOADNOTFINISHED: return "Partial Upload not finished";
+    case LIBMCDATA_ERROR_APIREQUESTNOTHANDLED: return "API Request not handled";
+    case LIBMCDATA_ERROR_APIREQUESTALREADYHANDLED: return "API Request already handled";
+    case LIBMCDATA_ERROR_INVALIDAPIREQUESTTYPE: return "Invalid API Request type";
+    case LIBMCDATA_ERROR_INVALIDUPLOADSTREAM: return "Invalid Upload Stream";
+    case LIBMCDATA_ERROR_COULDNOTPARSEJSONREQUEST: return "Could not parse JSON request";
+    case LIBMCDATA_ERROR_INVALIDCONTEXTUUID: return "Invalid Context UUID";
+    case LIBMCDATA_ERROR_INVALIDUPLOADNAME: return "Invalid Upload Name";
+    case LIBMCDATA_ERROR_INVALIDMIMETYPE: return "Invalid Mime Type";
+    case LIBMCDATA_ERROR_INVALIDSTREAMSIZE: return "Invalid Stream Size";
+    case LIBMCDATA_ERROR_INVALIDSHA256SUM: return "Invalid SHA256 Sum";
+    case LIBMCDATA_ERROR_INVALIDSTREAMUUID: return "Invalid Stream UUID";
+    case LIBMCDATA_ERROR_INVALIDFIELDNAME: return "Invalid field name";
+    case LIBMCDATA_ERROR_UPLOADSIZEMISMATCH: return "Upload size mismatch";
+    case LIBMCDATA_ERROR_CONTENTTYPENOTACCEPTED: return "Content type not accepted";
+    case LIBMCDATA_ERROR_NOCURRENTUPLOAD: return "No current upload";
+    case LIBMCDATA_ERROR_UPLOADCHECKSUMMISMATCH: return "Upload checksum mismatch";
+    case LIBMCDATA_ERROR_INVALIDSTORAGESTREAMSTATUS: return "Invalid storage stream status";
+    case LIBMCDATA_ERROR_CONTEXTUUIDNOTACCEPTED: return "Context uuid not accepted";
+    case LIBMCDATA_ERROR_INVALIDBUILDUUID: return "Invalid build uuid";
+    case LIBMCDATA_ERROR_MISSINGTHREADCOUNT: return "Missing thread count";
+    case LIBMCDATA_ERROR_INVALIDTHREADCOUNT: return "Invalid thread count";
+    case LIBMCDATA_ERROR_COULDNOTUPDATEBUILDSTATUS: return "Could not update build status";
+    case LIBMCDATA_ERROR_INVALIDITERATOR: return "Invalid iterator";
+    case LIBMCDATA_ERROR_INVALIDDATATYPE: return "Invalid data type";
+    case LIBMCDATA_ERROR_COULDNOTSENDSIGNAL: return "Could not send signal";
+    case LIBMCDATA_ERROR_MISSINGSIGNALPARAMETER: return "Missing signal parameter";
+    case LIBMCDATA_ERROR_NOUSERINTERFACEDEFINITION: return "No user interface definition";
+    case LIBMCDATA_ERROR_MISSINGAPPNAME: return "Missing app name";
+    case LIBMCDATA_ERROR_MISSINGCOPYRIGHT: return "Missing copyright";
+    case LIBMCDATA_ERROR_MISSINGMAINPAGE: return "Missing main page";
+    case LIBMCDATA_ERROR_MISSINGMENUITEMID: return "Missing menu item id";
+    case LIBMCDATA_ERROR_MISSINGMENUITEMICON: return "Missing menu item icon";
+    case LIBMCDATA_ERROR_MISSINGMENUITEMCAPTION: return "Missing menu item caption";
+    case LIBMCDATA_ERROR_MISSINGTARGETPAGE: return "Missing menu item target page";
+    case LIBMCDATA_ERROR_MISSINGMENUNODE: return "Missing menu node";
+    case LIBMCDATA_ERROR_MISSINGTOOLBARNODE: return "Missing toolbar node";
+    case LIBMCDATA_ERROR_MISSINGTOOLBARITEMID: return "Missing toolbar item id";
+    case LIBMCDATA_ERROR_MISSINGTOOLBARITEMICON: return "Missing toolbar item icon";
+    case LIBMCDATA_ERROR_MISSINGTOOLBARITEMCAPTION: return "Missing toolbar item caption";
+    case LIBMCDATA_ERROR_MISSINGSERVICESNODE: return "Missing services node";
     default: return "unknown error";
   }
 }
@@ -457,6 +537,8 @@ typedef LibMCDataHandle LibMCData_Iterator;
 typedef LibMCDataHandle LibMCData_LogSession;
 typedef LibMCDataHandle LibMCData_StorageStream;
 typedef LibMCDataHandle LibMCData_Storage;
+typedef LibMCDataHandle LibMCData_BuildJobData;
+typedef LibMCDataHandle LibMCData_BuildJobDataIterator;
 typedef LibMCDataHandle LibMCData_BuildJob;
 typedef LibMCDataHandle LibMCData_BuildJobIterator;
 typedef LibMCDataHandle LibMCData_BuildJobHandler;
@@ -487,7 +569,18 @@ namespace LibMCData {
     Created = 0,
     Validating = 100,
     Validated = 200,
-    Archived = 300
+    Archived = 300,
+    Deleted = 400
+  };
+  
+  enum class eBuildJobDataType : LibMCData_int32 {
+    Unknown = 0,
+    Toolpath = 1,
+    PNGImage = 2,
+    JPEGImage = 3,
+    Thumbnail = 4,
+    Timeline = 5,
+    CustomBinaryData = 100
   };
   
   /*************************************************************************************************************************
@@ -519,6 +612,7 @@ namespace LibMCData {
 typedef LibMCData::eLogLevel eLibMCDataLogLevel;
 typedef LibMCData::eDataBaseType eLibMCDataDataBaseType;
 typedef LibMCData::eBuildJobStatus eLibMCDataBuildJobStatus;
+typedef LibMCData::eBuildJobDataType eLibMCDataBuildJobDataType;
 typedef LibMCData::StreamReadCallback LibMCDataStreamReadCallback;
 typedef LibMCData::StreamSeekCallback LibMCDataStreamSeekCallback;
 
diff --git a/Framework/InterfacesCore/libmcdriverenv_abi.hpp b/Framework/InterfacesCore/libmcdriverenv_abi.hpp
index 0167b07f..e08dc06a 100644
--- a/Framework/InterfacesCore/libmcdriverenv_abi.hpp
+++ b/Framework/InterfacesCore/libmcdriverenv_abi.hpp
@@ -60,10 +60,144 @@ extern "C" {
  Class definition for Base
 **************************************************************************************************************************/
 
+/*************************************************************************************************************************
+ Class definition for WorkingFileExecution
+**************************************************************************************************************************/
+
+/**
+* Returns the execution status
+*
+* @param[in] pWorkingFileExecution - WorkingFileExecution instance.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingfileexecution_getstatus(LibMCDriverEnv_WorkingFileExecution pWorkingFileExecution);
+
+/**
+* Returns the output of the executable as string buffer
+*
+* @param[in] pWorkingFileExecution - WorkingFileExecution instance.
+* @param[in] nStringBufferBufferSize - size of the buffer (including trailing 0)
+* @param[out] pStringBufferNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pStringBufferBuffer -  buffer of stdout buffer, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingfileexecution_returnstdout(LibMCDriverEnv_WorkingFileExecution pWorkingFileExecution, const LibMCDriverEnv_uint32 nStringBufferBufferSize, LibMCDriverEnv_uint32* pStringBufferNeededChars, char * pStringBufferBuffer);
+
+/*************************************************************************************************************************
+ Class definition for WorkingFile
+**************************************************************************************************************************/
+
+/**
+* Retrieves absolute file name of the working file
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @param[in] nFileNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFileNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFileNameBuffer -  buffer of global path of the file, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingfile_getabsolutefilename(LibMCDriverEnv_WorkingFile pWorkingFile, const LibMCDriverEnv_uint32 nFileNameBufferSize, LibMCDriverEnv_uint32* pFileNameNeededChars, char * pFileNameBuffer);
+
+/**
+* Returns the size of temporary file.
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @param[out] pFileSize - file size
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingfile_getsize(LibMCDriverEnv_WorkingFile pWorkingFile, LibMCDriverEnv_uint64 * pFileSize);
+
+/**
+* Calculates the SHA256 checksum of the file.
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @param[in] nSHA2BufferSize - size of the buffer (including trailing 0)
+* @param[out] pSHA2NeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pSHA2Buffer -  buffer of sha256 checksum, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingfile_calculatesha2(LibMCDriverEnv_WorkingFile pWorkingFile, const LibMCDriverEnv_uint32 nSHA2BufferSize, LibMCDriverEnv_uint32* pSHA2NeededChars, char * pSHA2Buffer);
+
+/**
+* Deletes the temporary file.
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingfile_deletefile(LibMCDriverEnv_WorkingFile pWorkingFile);
+
+/**
+* Executes the temporary file, if it is an executable.
+*
+* @param[in] pWorkingFile - WorkingFile instance.
+* @param[out] pExecution - execution object
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingfile_executefile(LibMCDriverEnv_WorkingFile pWorkingFile, LibMCDriverEnv_WorkingFileExecution * pExecution);
+
+/*************************************************************************************************************************
+ Class definition for WorkingDirectory
+**************************************************************************************************************************/
+
+/**
+* Retrieves absolute file path.
+*
+* @param[in] pWorkingDirectory - WorkingDirectory instance.
+* @param[in] nFilePathBufferSize - size of the buffer (including trailing 0)
+* @param[out] pFilePathNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pFilePathBuffer -  buffer of global path of the directory, including path delimiter., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingdirectory_getabsolutefilepath(LibMCDriverEnv_WorkingDirectory pWorkingDirectory, const LibMCDriverEnv_uint32 nFilePathBufferSize, LibMCDriverEnv_uint32* pFilePathNeededChars, char * pFilePathBuffer);
+
+/**
+* Stores a data buffer in a temporary file.
+*
+* @param[in] pWorkingDirectory - WorkingDirectory instance.
+* @param[in] pFileName - filename to store to. Can not include any path delimiters or ..
+* @param[in] nDataBufferBufferSize - Number of elements in buffer
+* @param[in] pDataBufferBuffer - uint8 buffer of file data to store to.
+* @param[out] pWorkingFile - working file instance.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingdirectory_storecustomdata(LibMCDriverEnv_WorkingDirectory pWorkingDirectory, const char * pFileName, LibMCDriverEnv_uint64 nDataBufferBufferSize, const LibMCDriverEnv_uint8 * pDataBufferBuffer, LibMCDriverEnv_WorkingFile * pWorkingFile);
+
+/**
+* Stores attached driver data in a temporary file.
+*
+* @param[in] pWorkingDirectory - WorkingDirectory instance.
+* @param[in] pFileName - filename to store to. Can not include any path delimiters or ..
+* @param[in] pIdentifier - identifier of the binary data in the driver package.
+* @param[out] pWorkingFile - working file instance.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_workingdirectory_storedriverdata(LibMCDriverEnv_WorkingDirectory pWorkingDirectory, const char * pFileName, const char * pIdentifier, LibMCDriverEnv_WorkingFile * pWorkingFile);
+
 /*************************************************************************************************************************
  Class definition for DriverEnvironment
 **************************************************************************************************************************/
 
+/**
+* creates a temporary working directory.
+*
+* @param[in] pDriverEnvironment - DriverEnvironment instance.
+* @param[out] pWorkingDirectory - creates a working directory
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_driverenvironment_createworkingdirectory(LibMCDriverEnv_DriverEnvironment pDriverEnvironment, LibMCDriverEnv_WorkingDirectory * pWorkingDirectory);
+
+/**
+* retrieves attached driver data into a memory buffer.
+*
+* @param[in] pDriverEnvironment - DriverEnvironment instance.
+* @param[in] pIdentifier - identifier of the binary data in the driver package.
+* @param[in] nDataBufferBufferSize - Number of elements in buffer
+* @param[out] pDataBufferNeededCount - will be filled with the count of the written elements, or needed buffer size.
+* @param[out] pDataBufferBuffer - uint8 buffer of buffer data.
+* @return error code or 0 (success)
+*/
+LIBMCDRIVERENV_DECLSPEC LibMCDriverEnvResult libmcdriverenv_driverenvironment_retrievedriverdata(LibMCDriverEnv_DriverEnvironment pDriverEnvironment, const char * pIdentifier, const LibMCDriverEnv_uint64 nDataBufferBufferSize, LibMCDriverEnv_uint64* pDataBufferNeededCount, LibMCDriverEnv_uint8 * pDataBufferBuffer);
+
 /*************************************************************************************************************************
  Global functions
 **************************************************************************************************************************/
diff --git a/Framework/InterfacesCore/libmcdriverenv_interfaces.hpp b/Framework/InterfacesCore/libmcdriverenv_interfaces.hpp
index d060261f..e43e832d 100644
--- a/Framework/InterfacesCore/libmcdriverenv_interfaces.hpp
+++ b/Framework/InterfacesCore/libmcdriverenv_interfaces.hpp
@@ -55,6 +55,9 @@ namespace Impl {
  Forward declarations of class interfaces
 */
 class IBase;
+class IWorkingFileExecution;
+class IWorkingFile;
+class IWorkingDirectory;
 class IDriverEnvironment;
 
 
@@ -236,12 +239,123 @@ class IBaseSharedPtr : public std::shared_ptr<T>
 typedef IBaseSharedPtr<IBase> PIBase;
 
 
+/*************************************************************************************************************************
+ Class interface for WorkingFileExecution 
+**************************************************************************************************************************/
+
+class IWorkingFileExecution : public virtual IBase {
+public:
+	/**
+	* IWorkingFileExecution::GetStatus - Returns the execution status
+	*/
+	virtual void GetStatus() = 0;
+
+	/**
+	* IWorkingFileExecution::ReturnStdOut - Returns the output of the executable as string buffer
+	* @return stdout buffer
+	*/
+	virtual std::string ReturnStdOut() = 0;
+
+};
+
+typedef IBaseSharedPtr<IWorkingFileExecution> PIWorkingFileExecution;
+
+
+/*************************************************************************************************************************
+ Class interface for WorkingFile 
+**************************************************************************************************************************/
+
+class IWorkingFile : public virtual IBase {
+public:
+	/**
+	* IWorkingFile::GetAbsoluteFileName - Retrieves absolute file name of the working file
+	* @return global path of the file
+	*/
+	virtual std::string GetAbsoluteFileName() = 0;
+
+	/**
+	* IWorkingFile::GetSize - Returns the size of temporary file.
+	* @return file size
+	*/
+	virtual LibMCDriverEnv_uint64 GetSize() = 0;
+
+	/**
+	* IWorkingFile::CalculateSHA2 - Calculates the SHA256 checksum of the file.
+	* @return sha256 checksum
+	*/
+	virtual std::string CalculateSHA2() = 0;
+
+	/**
+	* IWorkingFile::DeleteFile - Deletes the temporary file.
+	*/
+	virtual void DeleteFile() = 0;
+
+	/**
+	* IWorkingFile::ExecuteFile - Executes the temporary file, if it is an executable.
+	* @return execution object
+	*/
+	virtual IWorkingFileExecution * ExecuteFile() = 0;
+
+};
+
+typedef IBaseSharedPtr<IWorkingFile> PIWorkingFile;
+
+
+/*************************************************************************************************************************
+ Class interface for WorkingDirectory 
+**************************************************************************************************************************/
+
+class IWorkingDirectory : public virtual IBase {
+public:
+	/**
+	* IWorkingDirectory::GetAbsoluteFilePath - Retrieves absolute file path.
+	* @return global path of the directory, including path delimiter.
+	*/
+	virtual std::string GetAbsoluteFilePath() = 0;
+
+	/**
+	* IWorkingDirectory::StoreCustomData - Stores a data buffer in a temporary file.
+	* @param[in] sFileName - filename to store to. Can not include any path delimiters or ..
+	* @param[in] nDataBufferBufferSize - Number of elements in buffer
+	* @param[in] pDataBufferBuffer - file data to store to.
+	* @return working file instance.
+	*/
+	virtual IWorkingFile * StoreCustomData(const std::string & sFileName, const LibMCDriverEnv_uint64 nDataBufferBufferSize, const LibMCDriverEnv_uint8 * pDataBufferBuffer) = 0;
+
+	/**
+	* IWorkingDirectory::StoreDriverData - Stores attached driver data in a temporary file.
+	* @param[in] sFileName - filename to store to. Can not include any path delimiters or ..
+	* @param[in] sIdentifier - identifier of the binary data in the driver package.
+	* @return working file instance.
+	*/
+	virtual IWorkingFile * StoreDriverData(const std::string & sFileName, const std::string & sIdentifier) = 0;
+
+};
+
+typedef IBaseSharedPtr<IWorkingDirectory> PIWorkingDirectory;
+
+
 /*************************************************************************************************************************
  Class interface for DriverEnvironment 
 **************************************************************************************************************************/
 
 class IDriverEnvironment : public virtual IBase {
 public:
+	/**
+	* IDriverEnvironment::CreateWorkingDirectory - creates a temporary working directory.
+	* @return creates a working directory
+	*/
+	virtual IWorkingDirectory * CreateWorkingDirectory() = 0;
+
+	/**
+	* IDriverEnvironment::RetrieveDriverData - retrieves attached driver data into a memory buffer.
+	* @param[in] sIdentifier - identifier of the binary data in the driver package.
+	* @param[in] nDataBufferBufferSize - Number of elements in buffer
+	* @param[out] pDataBufferNeededCount - will be filled with the count of the written structs, or needed buffer size.
+	* @param[out] pDataBufferBuffer - uint8 buffer of buffer data.
+	*/
+	virtual void RetrieveDriverData(const std::string & sIdentifier, LibMCDriverEnv_uint64 nDataBufferBufferSize, LibMCDriverEnv_uint64* pDataBufferNeededCount, LibMCDriverEnv_uint8 * pDataBufferBuffer) = 0;
+
 };
 
 typedef IBaseSharedPtr<IDriverEnvironment> PIDriverEnvironment;
diff --git a/Framework/InterfacesCore/libmcdriverenv_interfacewrapper.cpp b/Framework/InterfacesCore/libmcdriverenv_interfacewrapper.cpp
index 55fe5c8b..ae724b17 100644
--- a/Framework/InterfacesCore/libmcdriverenv_interfacewrapper.cpp
+++ b/Framework/InterfacesCore/libmcdriverenv_interfacewrapper.cpp
@@ -80,9 +80,439 @@ LibMCDriverEnvResult handleUnhandledException(IBase * pIBaseClass)
  Class implementation for Base
 **************************************************************************************************************************/
 
+/*************************************************************************************************************************
+ Class implementation for WorkingFileExecution
+**************************************************************************************************************************/
+LibMCDriverEnvResult libmcdriverenv_workingfileexecution_getstatus(LibMCDriverEnv_WorkingFileExecution pWorkingFileExecution)
+{
+	IBase* pIBaseClass = (IBase *)pWorkingFileExecution;
+
+	try {
+		IWorkingFileExecution* pIWorkingFileExecution = dynamic_cast<IWorkingFileExecution*>(pIBaseClass);
+		if (!pIWorkingFileExecution)
+			throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+		
+		pIWorkingFileExecution->GetStatus();
+
+		return LIBMCDRIVERENV_SUCCESS;
+	}
+	catch (ELibMCDriverEnvInterfaceException & Exception) {
+		return handleLibMCDriverEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriverEnvResult libmcdriverenv_workingfileexecution_returnstdout(LibMCDriverEnv_WorkingFileExecution pWorkingFileExecution, const LibMCDriverEnv_uint32 nStringBufferBufferSize, LibMCDriverEnv_uint32* pStringBufferNeededChars, char * pStringBufferBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pWorkingFileExecution;
+
+	try {
+		if ( (!pStringBufferBuffer) && !(pStringBufferNeededChars) )
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		std::string sStringBuffer("");
+		IWorkingFileExecution* pIWorkingFileExecution = dynamic_cast<IWorkingFileExecution*>(pIBaseClass);
+		if (!pIWorkingFileExecution)
+			throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pStringBufferBuffer == nullptr);
+		if (isCacheCall) {
+			sStringBuffer = pIWorkingFileExecution->ReturnStdOut();
+
+			pIWorkingFileExecution->_setCache (new ParameterCache_1<std::string> (sStringBuffer));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIWorkingFileExecution->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sStringBuffer);
+			pIWorkingFileExecution->_setCache (nullptr);
+		}
+		
+		if (pStringBufferNeededChars)
+			*pStringBufferNeededChars = (LibMCDriverEnv_uint32) (sStringBuffer.size()+1);
+		if (pStringBufferBuffer) {
+			if (sStringBuffer.size() >= nStringBufferBufferSize)
+				throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iStringBuffer = 0; iStringBuffer < sStringBuffer.size(); iStringBuffer++)
+				pStringBufferBuffer[iStringBuffer] = sStringBuffer[iStringBuffer];
+			pStringBufferBuffer[sStringBuffer.size()] = 0;
+		}
+		return LIBMCDRIVERENV_SUCCESS;
+	}
+	catch (ELibMCDriverEnvInterfaceException & Exception) {
+		return handleLibMCDriverEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for WorkingFile
+**************************************************************************************************************************/
+LibMCDriverEnvResult libmcdriverenv_workingfile_getabsolutefilename(LibMCDriverEnv_WorkingFile pWorkingFile, const LibMCDriverEnv_uint32 nFileNameBufferSize, LibMCDriverEnv_uint32* pFileNameNeededChars, char * pFileNameBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pWorkingFile;
+
+	try {
+		if ( (!pFileNameBuffer) && !(pFileNameNeededChars) )
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		std::string sFileName("");
+		IWorkingFile* pIWorkingFile = dynamic_cast<IWorkingFile*>(pIBaseClass);
+		if (!pIWorkingFile)
+			throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pFileNameBuffer == nullptr);
+		if (isCacheCall) {
+			sFileName = pIWorkingFile->GetAbsoluteFileName();
+
+			pIWorkingFile->_setCache (new ParameterCache_1<std::string> (sFileName));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIWorkingFile->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sFileName);
+			pIWorkingFile->_setCache (nullptr);
+		}
+		
+		if (pFileNameNeededChars)
+			*pFileNameNeededChars = (LibMCDriverEnv_uint32) (sFileName.size()+1);
+		if (pFileNameBuffer) {
+			if (sFileName.size() >= nFileNameBufferSize)
+				throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iFileName = 0; iFileName < sFileName.size(); iFileName++)
+				pFileNameBuffer[iFileName] = sFileName[iFileName];
+			pFileNameBuffer[sFileName.size()] = 0;
+		}
+		return LIBMCDRIVERENV_SUCCESS;
+	}
+	catch (ELibMCDriverEnvInterfaceException & Exception) {
+		return handleLibMCDriverEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriverEnvResult libmcdriverenv_workingfile_getsize(LibMCDriverEnv_WorkingFile pWorkingFile, LibMCDriverEnv_uint64 * pFileSize)
+{
+	IBase* pIBaseClass = (IBase *)pWorkingFile;
+
+	try {
+		if (pFileSize == nullptr)
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		IWorkingFile* pIWorkingFile = dynamic_cast<IWorkingFile*>(pIBaseClass);
+		if (!pIWorkingFile)
+			throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+		
+		*pFileSize = pIWorkingFile->GetSize();
+
+		return LIBMCDRIVERENV_SUCCESS;
+	}
+	catch (ELibMCDriverEnvInterfaceException & Exception) {
+		return handleLibMCDriverEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriverEnvResult libmcdriverenv_workingfile_calculatesha2(LibMCDriverEnv_WorkingFile pWorkingFile, const LibMCDriverEnv_uint32 nSHA2BufferSize, LibMCDriverEnv_uint32* pSHA2NeededChars, char * pSHA2Buffer)
+{
+	IBase* pIBaseClass = (IBase *)pWorkingFile;
+
+	try {
+		if ( (!pSHA2Buffer) && !(pSHA2NeededChars) )
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		std::string sSHA2("");
+		IWorkingFile* pIWorkingFile = dynamic_cast<IWorkingFile*>(pIBaseClass);
+		if (!pIWorkingFile)
+			throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pSHA2Buffer == nullptr);
+		if (isCacheCall) {
+			sSHA2 = pIWorkingFile->CalculateSHA2();
+
+			pIWorkingFile->_setCache (new ParameterCache_1<std::string> (sSHA2));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIWorkingFile->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sSHA2);
+			pIWorkingFile->_setCache (nullptr);
+		}
+		
+		if (pSHA2NeededChars)
+			*pSHA2NeededChars = (LibMCDriverEnv_uint32) (sSHA2.size()+1);
+		if (pSHA2Buffer) {
+			if (sSHA2.size() >= nSHA2BufferSize)
+				throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iSHA2 = 0; iSHA2 < sSHA2.size(); iSHA2++)
+				pSHA2Buffer[iSHA2] = sSHA2[iSHA2];
+			pSHA2Buffer[sSHA2.size()] = 0;
+		}
+		return LIBMCDRIVERENV_SUCCESS;
+	}
+	catch (ELibMCDriverEnvInterfaceException & Exception) {
+		return handleLibMCDriverEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriverEnvResult libmcdriverenv_workingfile_deletefile(LibMCDriverEnv_WorkingFile pWorkingFile)
+{
+	IBase* pIBaseClass = (IBase *)pWorkingFile;
+
+	try {
+		IWorkingFile* pIWorkingFile = dynamic_cast<IWorkingFile*>(pIBaseClass);
+		if (!pIWorkingFile)
+			throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+		
+		pIWorkingFile->DeleteFile();
+
+		return LIBMCDRIVERENV_SUCCESS;
+	}
+	catch (ELibMCDriverEnvInterfaceException & Exception) {
+		return handleLibMCDriverEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriverEnvResult libmcdriverenv_workingfile_executefile(LibMCDriverEnv_WorkingFile pWorkingFile, LibMCDriverEnv_WorkingFileExecution * pExecution)
+{
+	IBase* pIBaseClass = (IBase *)pWorkingFile;
+
+	try {
+		if (pExecution == nullptr)
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		IBase* pBaseExecution(nullptr);
+		IWorkingFile* pIWorkingFile = dynamic_cast<IWorkingFile*>(pIBaseClass);
+		if (!pIWorkingFile)
+			throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+		
+		pBaseExecution = pIWorkingFile->ExecuteFile();
+
+		*pExecution = (IBase*)(pBaseExecution);
+		return LIBMCDRIVERENV_SUCCESS;
+	}
+	catch (ELibMCDriverEnvInterfaceException & Exception) {
+		return handleLibMCDriverEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for WorkingDirectory
+**************************************************************************************************************************/
+LibMCDriverEnvResult libmcdriverenv_workingdirectory_getabsolutefilepath(LibMCDriverEnv_WorkingDirectory pWorkingDirectory, const LibMCDriverEnv_uint32 nFilePathBufferSize, LibMCDriverEnv_uint32* pFilePathNeededChars, char * pFilePathBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pWorkingDirectory;
+
+	try {
+		if ( (!pFilePathBuffer) && !(pFilePathNeededChars) )
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		std::string sFilePath("");
+		IWorkingDirectory* pIWorkingDirectory = dynamic_cast<IWorkingDirectory*>(pIBaseClass);
+		if (!pIWorkingDirectory)
+			throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pFilePathBuffer == nullptr);
+		if (isCacheCall) {
+			sFilePath = pIWorkingDirectory->GetAbsoluteFilePath();
+
+			pIWorkingDirectory->_setCache (new ParameterCache_1<std::string> (sFilePath));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIWorkingDirectory->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sFilePath);
+			pIWorkingDirectory->_setCache (nullptr);
+		}
+		
+		if (pFilePathNeededChars)
+			*pFilePathNeededChars = (LibMCDriverEnv_uint32) (sFilePath.size()+1);
+		if (pFilePathBuffer) {
+			if (sFilePath.size() >= nFilePathBufferSize)
+				throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iFilePath = 0; iFilePath < sFilePath.size(); iFilePath++)
+				pFilePathBuffer[iFilePath] = sFilePath[iFilePath];
+			pFilePathBuffer[sFilePath.size()] = 0;
+		}
+		return LIBMCDRIVERENV_SUCCESS;
+	}
+	catch (ELibMCDriverEnvInterfaceException & Exception) {
+		return handleLibMCDriverEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriverEnvResult libmcdriverenv_workingdirectory_storecustomdata(LibMCDriverEnv_WorkingDirectory pWorkingDirectory, const char * pFileName, LibMCDriverEnv_uint64 nDataBufferBufferSize, const LibMCDriverEnv_uint8 * pDataBufferBuffer, LibMCDriverEnv_WorkingFile * pWorkingFile)
+{
+	IBase* pIBaseClass = (IBase *)pWorkingDirectory;
+
+	try {
+		if (pFileName == nullptr)
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		if ( (!pDataBufferBuffer) && (nDataBufferBufferSize>0))
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		if (pWorkingFile == nullptr)
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		std::string sFileName(pFileName);
+		IBase* pBaseWorkingFile(nullptr);
+		IWorkingDirectory* pIWorkingDirectory = dynamic_cast<IWorkingDirectory*>(pIBaseClass);
+		if (!pIWorkingDirectory)
+			throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+		
+		pBaseWorkingFile = pIWorkingDirectory->StoreCustomData(sFileName, nDataBufferBufferSize, pDataBufferBuffer);
+
+		*pWorkingFile = (IBase*)(pBaseWorkingFile);
+		return LIBMCDRIVERENV_SUCCESS;
+	}
+	catch (ELibMCDriverEnvInterfaceException & Exception) {
+		return handleLibMCDriverEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriverEnvResult libmcdriverenv_workingdirectory_storedriverdata(LibMCDriverEnv_WorkingDirectory pWorkingDirectory, const char * pFileName, const char * pIdentifier, LibMCDriverEnv_WorkingFile * pWorkingFile)
+{
+	IBase* pIBaseClass = (IBase *)pWorkingDirectory;
+
+	try {
+		if (pFileName == nullptr)
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		if (pIdentifier == nullptr)
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		if (pWorkingFile == nullptr)
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		std::string sFileName(pFileName);
+		std::string sIdentifier(pIdentifier);
+		IBase* pBaseWorkingFile(nullptr);
+		IWorkingDirectory* pIWorkingDirectory = dynamic_cast<IWorkingDirectory*>(pIBaseClass);
+		if (!pIWorkingDirectory)
+			throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+		
+		pBaseWorkingFile = pIWorkingDirectory->StoreDriverData(sFileName, sIdentifier);
+
+		*pWorkingFile = (IBase*)(pBaseWorkingFile);
+		return LIBMCDRIVERENV_SUCCESS;
+	}
+	catch (ELibMCDriverEnvInterfaceException & Exception) {
+		return handleLibMCDriverEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
 /*************************************************************************************************************************
  Class implementation for DriverEnvironment
 **************************************************************************************************************************/
+LibMCDriverEnvResult libmcdriverenv_driverenvironment_createworkingdirectory(LibMCDriverEnv_DriverEnvironment pDriverEnvironment, LibMCDriverEnv_WorkingDirectory * pWorkingDirectory)
+{
+	IBase* pIBaseClass = (IBase *)pDriverEnvironment;
+
+	try {
+		if (pWorkingDirectory == nullptr)
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		IBase* pBaseWorkingDirectory(nullptr);
+		IDriverEnvironment* pIDriverEnvironment = dynamic_cast<IDriverEnvironment*>(pIBaseClass);
+		if (!pIDriverEnvironment)
+			throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+		
+		pBaseWorkingDirectory = pIDriverEnvironment->CreateWorkingDirectory();
+
+		*pWorkingDirectory = (IBase*)(pBaseWorkingDirectory);
+		return LIBMCDRIVERENV_SUCCESS;
+	}
+	catch (ELibMCDriverEnvInterfaceException & Exception) {
+		return handleLibMCDriverEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDriverEnvResult libmcdriverenv_driverenvironment_retrievedriverdata(LibMCDriverEnv_DriverEnvironment pDriverEnvironment, const char * pIdentifier, const LibMCDriverEnv_uint64 nDataBufferBufferSize, LibMCDriverEnv_uint64* pDataBufferNeededCount, LibMCDriverEnv_uint8 * pDataBufferBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pDriverEnvironment;
+
+	try {
+		if (pIdentifier == nullptr)
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		if ((!pDataBufferBuffer) && !(pDataBufferNeededCount))
+			throw ELibMCDriverEnvInterfaceException (LIBMCDRIVERENV_ERROR_INVALIDPARAM);
+		std::string sIdentifier(pIdentifier);
+		IDriverEnvironment* pIDriverEnvironment = dynamic_cast<IDriverEnvironment*>(pIBaseClass);
+		if (!pIDriverEnvironment)
+			throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_INVALIDCAST);
+		
+		pIDriverEnvironment->RetrieveDriverData(sIdentifier, nDataBufferBufferSize, pDataBufferNeededCount, pDataBufferBuffer);
+
+		return LIBMCDRIVERENV_SUCCESS;
+	}
+	catch (ELibMCDriverEnvInterfaceException & Exception) {
+		return handleLibMCDriverEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
 
 
 /*************************************************************************************************************************
@@ -98,6 +528,30 @@ LibMCDriverEnvResult LibMCDriverEnv::Impl::LibMCDriverEnv_GetProcAddress (const
 	*ppProcAddress = nullptr;
 	std::string sProcName (pProcName);
 	
+	if (sProcName == "libmcdriverenv_workingfileexecution_getstatus") 
+		*ppProcAddress = (void*) &libmcdriverenv_workingfileexecution_getstatus;
+	if (sProcName == "libmcdriverenv_workingfileexecution_returnstdout") 
+		*ppProcAddress = (void*) &libmcdriverenv_workingfileexecution_returnstdout;
+	if (sProcName == "libmcdriverenv_workingfile_getabsolutefilename") 
+		*ppProcAddress = (void*) &libmcdriverenv_workingfile_getabsolutefilename;
+	if (sProcName == "libmcdriverenv_workingfile_getsize") 
+		*ppProcAddress = (void*) &libmcdriverenv_workingfile_getsize;
+	if (sProcName == "libmcdriverenv_workingfile_calculatesha2") 
+		*ppProcAddress = (void*) &libmcdriverenv_workingfile_calculatesha2;
+	if (sProcName == "libmcdriverenv_workingfile_deletefile") 
+		*ppProcAddress = (void*) &libmcdriverenv_workingfile_deletefile;
+	if (sProcName == "libmcdriverenv_workingfile_executefile") 
+		*ppProcAddress = (void*) &libmcdriverenv_workingfile_executefile;
+	if (sProcName == "libmcdriverenv_workingdirectory_getabsolutefilepath") 
+		*ppProcAddress = (void*) &libmcdriverenv_workingdirectory_getabsolutefilepath;
+	if (sProcName == "libmcdriverenv_workingdirectory_storecustomdata") 
+		*ppProcAddress = (void*) &libmcdriverenv_workingdirectory_storecustomdata;
+	if (sProcName == "libmcdriverenv_workingdirectory_storedriverdata") 
+		*ppProcAddress = (void*) &libmcdriverenv_workingdirectory_storedriverdata;
+	if (sProcName == "libmcdriverenv_driverenvironment_createworkingdirectory") 
+		*ppProcAddress = (void*) &libmcdriverenv_driverenvironment_createworkingdirectory;
+	if (sProcName == "libmcdriverenv_driverenvironment_retrievedriverdata") 
+		*ppProcAddress = (void*) &libmcdriverenv_driverenvironment_retrievedriverdata;
 	if (sProcName == "libmcdriverenv_getversion") 
 		*ppProcAddress = (void*) &libmcdriverenv_getversion;
 	if (sProcName == "libmcdriverenv_getlasterror") 
diff --git a/Framework/InterfacesCore/libmcdriverenv_types.hpp b/Framework/InterfacesCore/libmcdriverenv_types.hpp
index 69f4befb..6dcfd4b9 100644
--- a/Framework/InterfacesCore/libmcdriverenv_types.hpp
+++ b/Framework/InterfacesCore/libmcdriverenv_types.hpp
@@ -145,6 +145,9 @@ inline const char * LIBMCDRIVERENV_GETERRORSTRING (LibMCDriverEnvResult nErrorCo
 **************************************************************************************************************************/
 
 typedef LibMCDriverEnvHandle LibMCDriverEnv_Base;
+typedef LibMCDriverEnvHandle LibMCDriverEnv_WorkingFileExecution;
+typedef LibMCDriverEnvHandle LibMCDriverEnv_WorkingFile;
+typedef LibMCDriverEnvHandle LibMCDriverEnv_WorkingDirectory;
 typedef LibMCDriverEnvHandle LibMCDriverEnv_DriverEnvironment;
 
 namespace LibMCDriverEnv {
diff --git a/Framework/InterfacesCore/libmcenv_abi.hpp b/Framework/InterfacesCore/libmcenv_abi.hpp
index f154ca1c..3d7c671f 100644
--- a/Framework/InterfacesCore/libmcenv_abi.hpp
+++ b/Framework/InterfacesCore/libmcenv_abi.hpp
@@ -107,6 +107,28 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentinfo(LibMCEnv_
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentprofileuuid(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_uint32 nIndex, const LibMCEnv_uint32 nProfileUUIDBufferSize, LibMCEnv_uint32* pProfileUUIDNeededChars, char * pProfileUUIDBuffer);
 
+/**
+* Retrieves an assigned profile custom value.
+*
+* @param[in] pToolpathLayer - ToolpathLayer instance.
+* @param[in] pValueName - Value Name to query for.
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of String Value., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentprofilevalue(LibMCEnv_ToolpathLayer pToolpathLayer, const char * pValueName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
+/**
+* Retrieves an assigned profile value of a standard type.
+*
+* @param[in] pToolpathLayer - ToolpathLayer instance.
+* @param[in] eValueType - Enum to query for. MUST NOT be custom.
+* @param[out] pValue - Double Value
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentprofiletypedvalue(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv::eToolpathProfileValueType eValueType, LibMCEnv_double * pValue);
+
 /**
 * Retrieves the assigned segment part uuid.
 *
@@ -126,25 +148,43 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentpartuuid(LibMC
 * @param[in] nIndex - Index. Must be between 0 and Count - 1.
 * @param[in] nPointDataBufferSize - Number of elements in buffer
 * @param[out] pPointDataNeededCount - will be filled with the count of the written elements, or needed buffer size.
-* @param[out] pPointDataBuffer - Position2D buffer of The point data array
+* @param[out] pPointDataBuffer - Position2D buffer of The point data array. Positions are absolute in units.
 * @return error code or 0 (success)
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentpointdata(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_uint32 nIndex, const LibMCEnv_uint64 nPointDataBufferSize, LibMCEnv_uint64* pPointDataNeededCount, LibMCEnv::sPosition2D * pPointDataBuffer);
 
+/**
+* Retrieves the layers Z Value in units.
+*
+* @param[in] pToolpathLayer - ToolpathLayer instance.
+* @param[out] pZValue - Z Value of the layer in units.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getzvalue(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_int32 * pZValue);
+
+/**
+* Retrieves the toolpath units in mm.
+*
+* @param[in] pToolpathLayer - ToolpathLayer instance.
+* @param[out] pUnits - Toolpath units.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getunits(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_double * pUnits);
+
 /*************************************************************************************************************************
  Class definition for ToolpathAccessor
 **************************************************************************************************************************/
 
 /**
-* Returns Toolpath data UUID.
+* Returns Toolpath storage UUID.
 *
 * @param[in] pToolpathAccessor - ToolpathAccessor instance.
-* @param[in] nUUIDBufferSize - size of the buffer (including trailing 0)
-* @param[out] pUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
-* @param[out] pUUIDBuffer -  buffer of Returns toolpath data uuid., may be NULL
+* @param[in] nStorageUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pStorageUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pStorageUUIDBuffer -  buffer of Returns toolpath storage uuid., may be NULL
 * @return error code or 0 (success)
 */
-LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathaccessor_getuuid(LibMCEnv_ToolpathAccessor pToolpathAccessor, const LibMCEnv_uint32 nUUIDBufferSize, LibMCEnv_uint32* pUUIDNeededChars, char * pUUIDBuffer);
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathaccessor_getstorageuuid(LibMCEnv_ToolpathAccessor pToolpathAccessor, const LibMCEnv_uint32 nStorageUUIDBufferSize, LibMCEnv_uint32* pStorageUUIDNeededChars, char * pStorageUUIDBuffer);
 
 /**
 * Returns layer count.
@@ -165,6 +205,121 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathaccessor_getlayercount(LibMCEn
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathaccessor_loadlayer(LibMCEnv_ToolpathAccessor pToolpathAccessor, LibMCEnv_uint32 nLayerIndex, LibMCEnv_ToolpathLayer * pLayerData);
 
+/**
+* Retrieves the toolpath units in mm.
+*
+* @param[in] pToolpathAccessor - ToolpathAccessor instance.
+* @param[out] pUnits - Toolpath units.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathaccessor_getunits(LibMCEnv_ToolpathAccessor pToolpathAccessor, LibMCEnv_double * pUnits);
+
+/*************************************************************************************************************************
+ Class definition for Build
+**************************************************************************************************************************/
+
+/**
+* Returns name of the build.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name of the build., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_getname(LibMCEnv_Build pBuild, const LibMCEnv_uint32 nNameBufferSize, LibMCEnv_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* Returns uuid of the build.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] nBuildUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pBuildUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pBuildUUIDBuffer -  buffer of UUID of the build., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_getbuilduuid(LibMCEnv_Build pBuild, const LibMCEnv_uint32 nBuildUUIDBufferSize, LibMCEnv_uint32* pBuildUUIDNeededChars, char * pBuildUUIDBuffer);
+
+/**
+* Returns storage uuid of the build.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] nStorageUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pStorageUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pStorageUUIDBuffer -  buffer of Storage UUID of the build., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_getstorageuuid(LibMCEnv_Build pBuild, const LibMCEnv_uint32 nStorageUUIDBufferSize, LibMCEnv_uint32* pStorageUUIDNeededChars, char * pStorageUUIDBuffer);
+
+/**
+* Returns SHA256 of the build stream.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] nSHA256BufferSize - size of the buffer (including trailing 0)
+* @param[out] pSHA256NeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pSHA256Buffer -  buffer of SHA256 of the build stream., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_getstoragesha256(LibMCEnv_Build pBuild, const LibMCEnv_uint32 nSHA256BufferSize, LibMCEnv_uint32* pSHA256NeededChars, char * pSHA256Buffer);
+
+/**
+* Returns cached layer count of the toolpath.
+*
+* @param[in] pBuild - Build instance.
+* @param[out] pLayerCount - Returns layer count.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_getlayercount(LibMCEnv_Build pBuild, LibMCEnv_uint32 * pLayerCount);
+
+/**
+* loads the a toolpath into memory
+*
+* @param[in] pBuild - Build instance.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_loadtoolpath(LibMCEnv_Build pBuild);
+
+/**
+* unloads the a toolpath from memory, if it has been loaded before.
+*
+* @param[in] pBuild - Build instance.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_unloadtoolpath(LibMCEnv_Build pBuild);
+
+/**
+* checks, if a toolpath object is loaded to memory.
+*
+* @param[in] pBuild - Build instance.
+* @param[out] pIsLoaded - returns if toolpath is loaded.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_toolpathisloaded(LibMCEnv_Build pBuild, bool * pIsLoaded);
+
+/**
+* Creates an accessor object for a toolpath. Toolpath MUST have been loaded with LoadToolpath before.
+*
+* @param[in] pBuild - Build instance.
+* @param[out] pToolpathInstance - Toolpath instance.
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_createtoolpathaccessor(LibMCEnv_Build pBuild, LibMCEnv_ToolpathAccessor * pToolpathInstance);
+
+/**
+* Adds binary data to store with the build.
+*
+* @param[in] pBuild - Build instance.
+* @param[in] pName - Name of the attache data block.
+* @param[in] pMIMEType - Mime type of the data.
+* @param[in] nContentBufferSize - Number of elements in buffer
+* @param[in] pContentBuffer - uint8 buffer of Stream content to store
+* @param[in] nDataUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pDataUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pDataUUIDBuffer -  buffer of Data UUID of the attachment., may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_build_addbinarydata(LibMCEnv_Build pBuild, const char * pName, const char * pMIMEType, LibMCEnv_uint64 nContentBufferSize, const LibMCEnv_uint8 * pContentBuffer, const LibMCEnv_uint32 nDataUUIDBufferSize, LibMCEnv_uint32* pDataUUIDNeededChars, char * pDataUUIDBuffer);
+
 /*************************************************************************************************************************
  Class definition for SignalTrigger
 **************************************************************************************************************************/
@@ -228,6 +383,16 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signaltrigger_getstatemachine(LibMCEnv
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signaltrigger_setstring(LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, const char * pValue);
 
+/**
+* sets a uuid value
+*
+* @param[in] pSignalTrigger - SignalTrigger instance.
+* @param[in] pName - Name
+* @param[in] pValue - Value
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signaltrigger_setuuid(LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, const char * pValue);
+
 /**
 * sets a double
 *
@@ -270,6 +435,18 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signaltrigger_setbool(LibMCEnv_SignalT
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signaltrigger_getstringresult(LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
 
+/**
+* returns a uuid value of the result
+*
+* @param[in] pSignalTrigger - SignalTrigger instance.
+* @param[in] pName - Name
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of Value, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signaltrigger_getuuidresult(LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
 /**
 * returns a string value of the result
 *
@@ -357,6 +534,18 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_getstatemachine(LibMCEnv
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_getstring(LibMCEnv_SignalHandler pSignalHandler, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
 
+/**
+* gets a uuid value
+*
+* @param[in] pSignalHandler - SignalHandler instance.
+* @param[in] pName - Name
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of Value, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_getuuid(LibMCEnv_SignalHandler pSignalHandler, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
 /**
 * gets a double
 *
@@ -397,6 +586,16 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_getbool(LibMCEnv_SignalH
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_setstringresult(LibMCEnv_SignalHandler pSignalHandler, const char * pName, const char * pValue);
 
+/**
+* returns a uuid value of the result
+*
+* @param[in] pSignalHandler - SignalHandler instance.
+* @param[in] pName - Name
+* @param[in] pValue - Value
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_setuuidresult(LibMCEnv_SignalHandler pSignalHandler, const char * pName, const char * pValue);
+
 /**
 * returns a string value of the result
 *
@@ -432,7 +631,7 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_setboolresult(LibMCEnv_S
 **************************************************************************************************************************/
 
 /**
-* creates a signal object to trigger.
+* prepares a signal object to trigger later.
 *
 * @param[in] pStateEnvironment - StateEnvironment instance.
 * @param[in] pMachineInstance - State machine instance name
@@ -440,7 +639,7 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_signalhandler_setboolresult(LibMCEnv_S
 * @param[out] pSignalInstance - Signal trigger object.
 * @return error code or 0 (success)
 */
-LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_createsignal(LibMCEnv_StateEnvironment pStateEnvironment, const char * pMachineInstance, const char * pSignalName, LibMCEnv_SignalTrigger * pSignalInstance);
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_preparesignal(LibMCEnv_StateEnvironment pStateEnvironment, const char * pMachineInstance, const char * pSignalName, LibMCEnv_SignalTrigger * pSignalInstance);
 
 /**
 * waits for a signal.
@@ -478,22 +677,14 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_getdriverlibrary(LibM
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_createdriveraccess(LibMCEnv_StateEnvironment pStateEnvironment, const char * pDriverName, LibMCEnv_pvoid * pDriverHandle);
 
 /**
-* Loads a toolpath from disk into memory.
+* Returns a instance of a build object.
 *
 * @param[in] pStateEnvironment - StateEnvironment instance.
-* @param[in] pToolpathUUID - UUID of the toolpath entity.
+* @param[in] pBuildUUID - UUID of the build entity.
+* @param[out] pBuildInstance - Build instance
 * @return error code or 0 (success)
 */
-LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_loadtoolpath(LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID);
-
-/**
-* unloads the a toolpath. It MUST have been loaded to memory before with LoadToolpath.
-*
-* @param[in] pStateEnvironment - StateEnvironment instance.
-* @param[in] pToolpathUUID - UUID of the toolpath entity.
-* @return error code or 0 (success)
-*/
-LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_unloadtoolpath(LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID);
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_getbuildjob(LibMCEnv_StateEnvironment pStateEnvironment, const char * pBuildUUID, LibMCEnv_Build * pBuildInstance);
 
 /**
 * unloads all toolpath in memory to clean up
@@ -503,26 +694,6 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_unloadtoolpath(LibMCE
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_unloadalltoolpathes(LibMCEnv_StateEnvironment pStateEnvironment);
 
-/**
-* creates an accessor object for a toolpath, if loaded to memory before.
-*
-* @param[in] pStateEnvironment - StateEnvironment instance.
-* @param[in] pToolpathUUID - UUID of the toolpath entity.
-* @param[out] pToolpathInstance - UUID of the toolpath entity.
-* @return error code or 0 (success)
-*/
-LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_createtoolpathaccessor(LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID, LibMCEnv_ToolpathAccessor * pToolpathInstance);
-
-/**
-* checks, if a toolpath object is loaded to memory.
-*
-* @param[in] pStateEnvironment - StateEnvironment instance.
-* @param[in] pToolpathUUID - UUID of the toolpath entity.
-* @param[out] pIsLoaded - returns if toolpath is loaded.
-* @return error code or 0 (success)
-*/
-LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_toolpathisloaded(LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID, bool * pIsLoaded);
-
 /**
 * sets the next state
 *
@@ -587,6 +758,16 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_checkfortermination(L
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_storestring(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const char * pValue);
 
+/**
+* stores a uuid in the current state machine
+*
+* @param[in] pStateEnvironment - StateEnvironment instance.
+* @param[in] pName - Name
+* @param[in] pValue - Value
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_storeuuid(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const char * pValue);
+
 /**
 * stores a string in the current state machine
 *
@@ -639,6 +820,18 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_storesignal(LibMCEnv_
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_retrievestring(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
 
+/**
+* retrieves a uuid from the current state machine. Fails if value has not been stored before.
+*
+* @param[in] pStateEnvironment - StateEnvironment instance.
+* @param[in] pName - Name
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of Value, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_retrieveuuid(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
 /**
 * retrieves a string from the current state machine. Fails if value has not been stored before.
 *
@@ -699,6 +892,17 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_clearstoredvalue(LibM
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_setstringparameter(LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, const char * pValue);
 
+/**
+* sets a uuid parameter
+*
+* @param[in] pStateEnvironment - StateEnvironment instance.
+* @param[in] pParameterGroup - Parameter Group
+* @param[in] pParameterName - Parameter Name
+* @param[in] pValue - Value to set
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_setuuidparameter(LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, const char * pValue);
+
 /**
 * sets a double parameter
 *
@@ -745,6 +949,19 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_setboolparameter(LibM
 */
 LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_getstringparameter(LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
 
+/**
+* returns a uuid parameter
+*
+* @param[in] pStateEnvironment - StateEnvironment instance.
+* @param[in] pParameterGroup - Parameter Group
+* @param[in] pParameterName - Parameter Name
+* @param[in] nValueBufferSize - size of the buffer (including trailing 0)
+* @param[out] pValueNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pValueBuffer -  buffer of Value to set, may be NULL
+* @return error code or 0 (success)
+*/
+LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_stateenvironment_getuuidparameter(LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer);
+
 /**
 * returns a double parameter
 *
diff --git a/Framework/InterfacesCore/libmcenv_interfaces.hpp b/Framework/InterfacesCore/libmcenv_interfaces.hpp
index c163a41b..f5e8369c 100644
--- a/Framework/InterfacesCore/libmcenv_interfaces.hpp
+++ b/Framework/InterfacesCore/libmcenv_interfaces.hpp
@@ -57,6 +57,7 @@ namespace Impl {
 class IBase;
 class IToolpathLayer;
 class IToolpathAccessor;
+class IBuild;
 class ISignalTrigger;
 class ISignalHandler;
 class IStateEnvironment;
@@ -273,6 +274,20 @@ class IToolpathLayer : public virtual IBase {
 	*/
 	virtual std::string GetSegmentProfileUUID(const LibMCEnv_uint32 nIndex) = 0;
 
+	/**
+	* IToolpathLayer::GetSegmentProfileValue - Retrieves an assigned profile custom value.
+	* @param[in] sValueName - Value Name to query for.
+	* @return String Value.
+	*/
+	virtual std::string GetSegmentProfileValue(const std::string & sValueName) = 0;
+
+	/**
+	* IToolpathLayer::GetSegmentProfileTypedValue - Retrieves an assigned profile value of a standard type.
+	* @param[in] eValueType - Enum to query for. MUST NOT be custom.
+	* @return Double Value
+	*/
+	virtual LibMCEnv_double GetSegmentProfileTypedValue(const LibMCEnv::eToolpathProfileValueType eValueType) = 0;
+
 	/**
 	* IToolpathLayer::GetSegmentPartUUID - Retrieves the assigned segment part uuid.
 	* @param[in] nIndex - Index. Must be between 0 and Count - 1.
@@ -285,10 +300,22 @@ class IToolpathLayer : public virtual IBase {
 	* @param[in] nIndex - Index. Must be between 0 and Count - 1.
 	* @param[in] nPointDataBufferSize - Number of elements in buffer
 	* @param[out] pPointDataNeededCount - will be filled with the count of the written structs, or needed buffer size.
-	* @param[out] pPointDataBuffer - Position2D buffer of The point data array
+	* @param[out] pPointDataBuffer - Position2D buffer of The point data array. Positions are absolute in units.
 	*/
 	virtual void GetSegmentPointData(const LibMCEnv_uint32 nIndex, LibMCEnv_uint64 nPointDataBufferSize, LibMCEnv_uint64* pPointDataNeededCount, LibMCEnv::sPosition2D * pPointDataBuffer) = 0;
 
+	/**
+	* IToolpathLayer::GetZValue - Retrieves the layers Z Value in units.
+	* @return Z Value of the layer in units.
+	*/
+	virtual LibMCEnv_int32 GetZValue() = 0;
+
+	/**
+	* IToolpathLayer::GetUnits - Retrieves the toolpath units in mm.
+	* @return Toolpath units.
+	*/
+	virtual LibMCEnv_double GetUnits() = 0;
+
 };
 
 typedef IBaseSharedPtr<IToolpathLayer> PIToolpathLayer;
@@ -301,10 +328,10 @@ typedef IBaseSharedPtr<IToolpathLayer> PIToolpathLayer;
 class IToolpathAccessor : public virtual IBase {
 public:
 	/**
-	* IToolpathAccessor::GetUUID - Returns Toolpath data UUID.
-	* @return Returns toolpath data uuid.
+	* IToolpathAccessor::GetStorageUUID - Returns Toolpath storage UUID.
+	* @return Returns toolpath storage uuid.
 	*/
-	virtual std::string GetUUID() = 0;
+	virtual std::string GetStorageUUID() = 0;
 
 	/**
 	* IToolpathAccessor::GetLayerCount - Returns layer count.
@@ -319,11 +346,90 @@ class IToolpathAccessor : public virtual IBase {
 	*/
 	virtual IToolpathLayer * LoadLayer(const LibMCEnv_uint32 nLayerIndex) = 0;
 
+	/**
+	* IToolpathAccessor::GetUnits - Retrieves the toolpath units in mm.
+	* @return Toolpath units.
+	*/
+	virtual LibMCEnv_double GetUnits() = 0;
+
 };
 
 typedef IBaseSharedPtr<IToolpathAccessor> PIToolpathAccessor;
 
 
+/*************************************************************************************************************************
+ Class interface for Build 
+**************************************************************************************************************************/
+
+class IBuild : public virtual IBase {
+public:
+	/**
+	* IBuild::GetName - Returns name of the build.
+	* @return Name of the build.
+	*/
+	virtual std::string GetName() = 0;
+
+	/**
+	* IBuild::GetBuildUUID - Returns uuid of the build.
+	* @return UUID of the build.
+	*/
+	virtual std::string GetBuildUUID() = 0;
+
+	/**
+	* IBuild::GetStorageUUID - Returns storage uuid of the build.
+	* @return Storage UUID of the build.
+	*/
+	virtual std::string GetStorageUUID() = 0;
+
+	/**
+	* IBuild::GetStorageSHA256 - Returns SHA256 of the build stream.
+	* @return SHA256 of the build stream.
+	*/
+	virtual std::string GetStorageSHA256() = 0;
+
+	/**
+	* IBuild::GetLayerCount - Returns cached layer count of the toolpath.
+	* @return Returns layer count.
+	*/
+	virtual LibMCEnv_uint32 GetLayerCount() = 0;
+
+	/**
+	* IBuild::LoadToolpath - loads the a toolpath into memory
+	*/
+	virtual void LoadToolpath() = 0;
+
+	/**
+	* IBuild::UnloadToolpath - unloads the a toolpath from memory, if it has been loaded before.
+	*/
+	virtual void UnloadToolpath() = 0;
+
+	/**
+	* IBuild::ToolpathIsLoaded - checks, if a toolpath object is loaded to memory.
+	* @return returns if toolpath is loaded.
+	*/
+	virtual bool ToolpathIsLoaded() = 0;
+
+	/**
+	* IBuild::CreateToolpathAccessor - Creates an accessor object for a toolpath. Toolpath MUST have been loaded with LoadToolpath before.
+	* @return Toolpath instance.
+	*/
+	virtual IToolpathAccessor * CreateToolpathAccessor() = 0;
+
+	/**
+	* IBuild::AddBinaryData - Adds binary data to store with the build.
+	* @param[in] sName - Name of the attache data block.
+	* @param[in] sMIMEType - Mime type of the data.
+	* @param[in] nContentBufferSize - Number of elements in buffer
+	* @param[in] pContentBuffer - Stream content to store
+	* @return Data UUID of the attachment.
+	*/
+	virtual std::string AddBinaryData(const std::string & sName, const std::string & sMIMEType, const LibMCEnv_uint64 nContentBufferSize, const LibMCEnv_uint8 * pContentBuffer) = 0;
+
+};
+
+typedef IBaseSharedPtr<IBuild> PIBuild;
+
+
 /*************************************************************************************************************************
  Class interface for SignalTrigger 
 **************************************************************************************************************************/
@@ -367,6 +473,13 @@ class ISignalTrigger : public virtual IBase {
 	*/
 	virtual void SetString(const std::string & sName, const std::string & sValue) = 0;
 
+	/**
+	* ISignalTrigger::SetUUID - sets a uuid value
+	* @param[in] sName - Name
+	* @param[in] sValue - Value
+	*/
+	virtual void SetUUID(const std::string & sName, const std::string & sValue) = 0;
+
 	/**
 	* ISignalTrigger::SetDouble - sets a double
 	* @param[in] sName - Name
@@ -395,6 +508,13 @@ class ISignalTrigger : public virtual IBase {
 	*/
 	virtual std::string GetStringResult(const std::string & sName) = 0;
 
+	/**
+	* ISignalTrigger::GetUUIDResult - returns a uuid value of the result
+	* @param[in] sName - Name
+	* @return Value
+	*/
+	virtual std::string GetUUIDResult(const std::string & sName) = 0;
+
 	/**
 	* ISignalTrigger::GetDoubleResult - returns a string value of the result
 	* @param[in] sName - Name
@@ -457,6 +577,13 @@ class ISignalHandler : public virtual IBase {
 	*/
 	virtual std::string GetString(const std::string & sName) = 0;
 
+	/**
+	* ISignalHandler::GetUUID - gets a uuid value
+	* @param[in] sName - Name
+	* @return Value
+	*/
+	virtual std::string GetUUID(const std::string & sName) = 0;
+
 	/**
 	* ISignalHandler::GetDouble - gets a double
 	* @param[in] sName - Name
@@ -485,6 +612,13 @@ class ISignalHandler : public virtual IBase {
 	*/
 	virtual void SetStringResult(const std::string & sName, const std::string & sValue) = 0;
 
+	/**
+	* ISignalHandler::SetUUIDResult - returns a uuid value of the result
+	* @param[in] sName - Name
+	* @param[in] sValue - Value
+	*/
+	virtual void SetUUIDResult(const std::string & sName, const std::string & sValue) = 0;
+
 	/**
 	* ISignalHandler::SetDoubleResult - returns a string value of the result
 	* @param[in] sName - Name
@@ -518,12 +652,12 @@ typedef IBaseSharedPtr<ISignalHandler> PISignalHandler;
 class IStateEnvironment : public virtual IBase {
 public:
 	/**
-	* IStateEnvironment::CreateSignal - creates a signal object to trigger.
+	* IStateEnvironment::PrepareSignal - prepares a signal object to trigger later.
 	* @param[in] sMachineInstance - State machine instance name
 	* @param[in] sSignalName - Name Of signal channel.
 	* @return Signal trigger object.
 	*/
-	virtual ISignalTrigger * CreateSignal(const std::string & sMachineInstance, const std::string & sSignalName) = 0;
+	virtual ISignalTrigger * PrepareSignal(const std::string & sMachineInstance, const std::string & sSignalName) = 0;
 
 	/**
 	* IStateEnvironment::WaitForSignal - waits for a signal.
@@ -550,36 +684,17 @@ class IStateEnvironment : public virtual IBase {
 	virtual void CreateDriverAccess(const std::string & sDriverName, LibMCEnv_pvoid & pDriverHandle) = 0;
 
 	/**
-	* IStateEnvironment::LoadToolpath - Loads a toolpath from disk into memory.
-	* @param[in] sToolpathUUID - UUID of the toolpath entity.
-	*/
-	virtual void LoadToolpath(const std::string & sToolpathUUID) = 0;
-
-	/**
-	* IStateEnvironment::UnloadToolpath - unloads the a toolpath. It MUST have been loaded to memory before with LoadToolpath.
-	* @param[in] sToolpathUUID - UUID of the toolpath entity.
+	* IStateEnvironment::GetBuildJob - Returns a instance of a build object.
+	* @param[in] sBuildUUID - UUID of the build entity.
+	* @return Build instance
 	*/
-	virtual void UnloadToolpath(const std::string & sToolpathUUID) = 0;
+	virtual IBuild * GetBuildJob(const std::string & sBuildUUID) = 0;
 
 	/**
 	* IStateEnvironment::UnloadAllToolpathes - unloads all toolpath in memory to clean up
 	*/
 	virtual void UnloadAllToolpathes() = 0;
 
-	/**
-	* IStateEnvironment::CreateToolpathAccessor - creates an accessor object for a toolpath, if loaded to memory before.
-	* @param[in] sToolpathUUID - UUID of the toolpath entity.
-	* @return UUID of the toolpath entity.
-	*/
-	virtual IToolpathAccessor * CreateToolpathAccessor(const std::string & sToolpathUUID) = 0;
-
-	/**
-	* IStateEnvironment::ToolpathIsLoaded - checks, if a toolpath object is loaded to memory.
-	* @param[in] sToolpathUUID - UUID of the toolpath entity.
-	* @return returns if toolpath is loaded.
-	*/
-	virtual bool ToolpathIsLoaded(const std::string & sToolpathUUID) = 0;
-
 	/**
 	* IStateEnvironment::SetNextState - sets the next state
 	* @param[in] sStateName - Name of next state
@@ -623,6 +738,13 @@ class IStateEnvironment : public virtual IBase {
 	*/
 	virtual void StoreString(const std::string & sName, const std::string & sValue) = 0;
 
+	/**
+	* IStateEnvironment::StoreUUID - stores a uuid in the current state machine
+	* @param[in] sName - Name
+	* @param[in] sValue - Value
+	*/
+	virtual void StoreUUID(const std::string & sName, const std::string & sValue) = 0;
+
 	/**
 	* IStateEnvironment::StoreInteger - stores a string in the current state machine
 	* @param[in] sName - Name
@@ -658,6 +780,13 @@ class IStateEnvironment : public virtual IBase {
 	*/
 	virtual std::string RetrieveString(const std::string & sName) = 0;
 
+	/**
+	* IStateEnvironment::RetrieveUUID - retrieves a uuid from the current state machine. Fails if value has not been stored before.
+	* @param[in] sName - Name
+	* @return Value
+	*/
+	virtual std::string RetrieveUUID(const std::string & sName) = 0;
+
 	/**
 	* IStateEnvironment::RetrieveInteger - retrieves a string from the current state machine. Fails if value has not been stored before.
 	* @param[in] sName - Name
@@ -700,6 +829,14 @@ class IStateEnvironment : public virtual IBase {
 	*/
 	virtual void SetStringParameter(const std::string & sParameterGroup, const std::string & sParameterName, const std::string & sValue) = 0;
 
+	/**
+	* IStateEnvironment::SetUUIDParameter - sets a uuid parameter
+	* @param[in] sParameterGroup - Parameter Group
+	* @param[in] sParameterName - Parameter Name
+	* @param[in] sValue - Value to set
+	*/
+	virtual void SetUUIDParameter(const std::string & sParameterGroup, const std::string & sParameterName, const std::string & sValue) = 0;
+
 	/**
 	* IStateEnvironment::SetDoubleParameter - sets a double parameter
 	* @param[in] sParameterGroup - Parameter Group
@@ -732,6 +869,14 @@ class IStateEnvironment : public virtual IBase {
 	*/
 	virtual std::string GetStringParameter(const std::string & sParameterGroup, const std::string & sParameterName) = 0;
 
+	/**
+	* IStateEnvironment::GetUUIDParameter - returns a uuid parameter
+	* @param[in] sParameterGroup - Parameter Group
+	* @param[in] sParameterName - Parameter Name
+	* @return Value to set
+	*/
+	virtual std::string GetUUIDParameter(const std::string & sParameterGroup, const std::string & sParameterName) = 0;
+
 	/**
 	* IStateEnvironment::GetDoubleParameter - returns a double parameter
 	* @param[in] sParameterGroup - Parameter Group
diff --git a/Framework/InterfacesCore/libmcenv_interfacewrapper.cpp b/Framework/InterfacesCore/libmcenv_interfacewrapper.cpp
index b99e5943..966eafa3 100644
--- a/Framework/InterfacesCore/libmcenv_interfacewrapper.cpp
+++ b/Framework/InterfacesCore/libmcenv_interfacewrapper.cpp
@@ -233,40 +233,523 @@ LibMCEnvResult libmcenv_toolpathlayer_getsegmentprofileuuid(LibMCEnv_ToolpathLay
 	}
 }
 
+LibMCEnvResult libmcenv_toolpathlayer_getsegmentprofilevalue(LibMCEnv_ToolpathLayer pToolpathLayer, const char * pValueName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pToolpathLayer;
+
+	try {
+		if (pValueName == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		if ( (!pValueBuffer) && !(pValueNeededChars) )
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sValueName(pValueName);
+		std::string sValue("");
+		IToolpathLayer* pIToolpathLayer = dynamic_cast<IToolpathLayer*>(pIBaseClass);
+		if (!pIToolpathLayer)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pValueBuffer == nullptr);
+		if (isCacheCall) {
+			sValue = pIToolpathLayer->GetSegmentProfileValue(sValueName);
+
+			pIToolpathLayer->_setCache (new ParameterCache_1<std::string> (sValue));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIToolpathLayer->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sValue);
+			pIToolpathLayer->_setCache (nullptr);
+		}
+		
+		if (pValueNeededChars)
+			*pValueNeededChars = (LibMCEnv_uint32) (sValue.size()+1);
+		if (pValueBuffer) {
+			if (sValue.size() >= nValueBufferSize)
+				throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iValue = 0; iValue < sValue.size(); iValue++)
+				pValueBuffer[iValue] = sValue[iValue];
+			pValueBuffer[sValue.size()] = 0;
+		}
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCEnvResult libmcenv_toolpathlayer_getsegmentprofiletypedvalue(LibMCEnv_ToolpathLayer pToolpathLayer, eLibMCEnvToolpathProfileValueType eValueType, LibMCEnv_double * pValue)
+{
+	IBase* pIBaseClass = (IBase *)pToolpathLayer;
+
+	try {
+		if (pValue == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		IToolpathLayer* pIToolpathLayer = dynamic_cast<IToolpathLayer*>(pIBaseClass);
+		if (!pIToolpathLayer)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		*pValue = pIToolpathLayer->GetSegmentProfileTypedValue(eValueType);
+
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
 LibMCEnvResult libmcenv_toolpathlayer_getsegmentpartuuid(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_uint32 nIndex, const LibMCEnv_uint32 nPartUUIDBufferSize, LibMCEnv_uint32* pPartUUIDNeededChars, char * pPartUUIDBuffer)
 {
-	IBase* pIBaseClass = (IBase *)pToolpathLayer;
+	IBase* pIBaseClass = (IBase *)pToolpathLayer;
+
+	try {
+		if ( (!pPartUUIDBuffer) && !(pPartUUIDNeededChars) )
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sPartUUID("");
+		IToolpathLayer* pIToolpathLayer = dynamic_cast<IToolpathLayer*>(pIBaseClass);
+		if (!pIToolpathLayer)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pPartUUIDBuffer == nullptr);
+		if (isCacheCall) {
+			sPartUUID = pIToolpathLayer->GetSegmentPartUUID(nIndex);
+
+			pIToolpathLayer->_setCache (new ParameterCache_1<std::string> (sPartUUID));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIToolpathLayer->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sPartUUID);
+			pIToolpathLayer->_setCache (nullptr);
+		}
+		
+		if (pPartUUIDNeededChars)
+			*pPartUUIDNeededChars = (LibMCEnv_uint32) (sPartUUID.size()+1);
+		if (pPartUUIDBuffer) {
+			if (sPartUUID.size() >= nPartUUIDBufferSize)
+				throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iPartUUID = 0; iPartUUID < sPartUUID.size(); iPartUUID++)
+				pPartUUIDBuffer[iPartUUID] = sPartUUID[iPartUUID];
+			pPartUUIDBuffer[sPartUUID.size()] = 0;
+		}
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCEnvResult libmcenv_toolpathlayer_getsegmentpointdata(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_uint32 nIndex, const LibMCEnv_uint64 nPointDataBufferSize, LibMCEnv_uint64* pPointDataNeededCount, sLibMCEnvPosition2D * pPointDataBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pToolpathLayer;
+
+	try {
+		if ((!pPointDataBuffer) && !(pPointDataNeededCount))
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		IToolpathLayer* pIToolpathLayer = dynamic_cast<IToolpathLayer*>(pIBaseClass);
+		if (!pIToolpathLayer)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		pIToolpathLayer->GetSegmentPointData(nIndex, nPointDataBufferSize, pPointDataNeededCount, pPointDataBuffer);
+
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCEnvResult libmcenv_toolpathlayer_getzvalue(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_int32 * pZValue)
+{
+	IBase* pIBaseClass = (IBase *)pToolpathLayer;
+
+	try {
+		if (pZValue == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		IToolpathLayer* pIToolpathLayer = dynamic_cast<IToolpathLayer*>(pIBaseClass);
+		if (!pIToolpathLayer)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		*pZValue = pIToolpathLayer->GetZValue();
+
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCEnvResult libmcenv_toolpathlayer_getunits(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_double * pUnits)
+{
+	IBase* pIBaseClass = (IBase *)pToolpathLayer;
+
+	try {
+		if (pUnits == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		IToolpathLayer* pIToolpathLayer = dynamic_cast<IToolpathLayer*>(pIBaseClass);
+		if (!pIToolpathLayer)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		*pUnits = pIToolpathLayer->GetUnits();
+
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for ToolpathAccessor
+**************************************************************************************************************************/
+LibMCEnvResult libmcenv_toolpathaccessor_getstorageuuid(LibMCEnv_ToolpathAccessor pToolpathAccessor, const LibMCEnv_uint32 nStorageUUIDBufferSize, LibMCEnv_uint32* pStorageUUIDNeededChars, char * pStorageUUIDBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pToolpathAccessor;
+
+	try {
+		if ( (!pStorageUUIDBuffer) && !(pStorageUUIDNeededChars) )
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sStorageUUID("");
+		IToolpathAccessor* pIToolpathAccessor = dynamic_cast<IToolpathAccessor*>(pIBaseClass);
+		if (!pIToolpathAccessor)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pStorageUUIDBuffer == nullptr);
+		if (isCacheCall) {
+			sStorageUUID = pIToolpathAccessor->GetStorageUUID();
+
+			pIToolpathAccessor->_setCache (new ParameterCache_1<std::string> (sStorageUUID));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIToolpathAccessor->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sStorageUUID);
+			pIToolpathAccessor->_setCache (nullptr);
+		}
+		
+		if (pStorageUUIDNeededChars)
+			*pStorageUUIDNeededChars = (LibMCEnv_uint32) (sStorageUUID.size()+1);
+		if (pStorageUUIDBuffer) {
+			if (sStorageUUID.size() >= nStorageUUIDBufferSize)
+				throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iStorageUUID = 0; iStorageUUID < sStorageUUID.size(); iStorageUUID++)
+				pStorageUUIDBuffer[iStorageUUID] = sStorageUUID[iStorageUUID];
+			pStorageUUIDBuffer[sStorageUUID.size()] = 0;
+		}
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCEnvResult libmcenv_toolpathaccessor_getlayercount(LibMCEnv_ToolpathAccessor pToolpathAccessor, LibMCEnv_uint32 * pLayerCount)
+{
+	IBase* pIBaseClass = (IBase *)pToolpathAccessor;
+
+	try {
+		if (pLayerCount == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		IToolpathAccessor* pIToolpathAccessor = dynamic_cast<IToolpathAccessor*>(pIBaseClass);
+		if (!pIToolpathAccessor)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		*pLayerCount = pIToolpathAccessor->GetLayerCount();
+
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCEnvResult libmcenv_toolpathaccessor_loadlayer(LibMCEnv_ToolpathAccessor pToolpathAccessor, LibMCEnv_uint32 nLayerIndex, LibMCEnv_ToolpathLayer * pLayerData)
+{
+	IBase* pIBaseClass = (IBase *)pToolpathAccessor;
+
+	try {
+		if (pLayerData == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		IBase* pBaseLayerData(nullptr);
+		IToolpathAccessor* pIToolpathAccessor = dynamic_cast<IToolpathAccessor*>(pIBaseClass);
+		if (!pIToolpathAccessor)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		pBaseLayerData = pIToolpathAccessor->LoadLayer(nLayerIndex);
+
+		*pLayerData = (IBase*)(pBaseLayerData);
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCEnvResult libmcenv_toolpathaccessor_getunits(LibMCEnv_ToolpathAccessor pToolpathAccessor, LibMCEnv_double * pUnits)
+{
+	IBase* pIBaseClass = (IBase *)pToolpathAccessor;
+
+	try {
+		if (pUnits == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		IToolpathAccessor* pIToolpathAccessor = dynamic_cast<IToolpathAccessor*>(pIBaseClass);
+		if (!pIToolpathAccessor)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		*pUnits = pIToolpathAccessor->GetUnits();
+
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+
+/*************************************************************************************************************************
+ Class implementation for Build
+**************************************************************************************************************************/
+LibMCEnvResult libmcenv_build_getname(LibMCEnv_Build pBuild, const LibMCEnv_uint32 nNameBufferSize, LibMCEnv_uint32* pNameNeededChars, char * pNameBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pBuild;
+
+	try {
+		if ( (!pNameBuffer) && !(pNameNeededChars) )
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sName("");
+		IBuild* pIBuild = dynamic_cast<IBuild*>(pIBaseClass);
+		if (!pIBuild)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pNameBuffer == nullptr);
+		if (isCacheCall) {
+			sName = pIBuild->GetName();
+
+			pIBuild->_setCache (new ParameterCache_1<std::string> (sName));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuild->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sName);
+			pIBuild->_setCache (nullptr);
+		}
+		
+		if (pNameNeededChars)
+			*pNameNeededChars = (LibMCEnv_uint32) (sName.size()+1);
+		if (pNameBuffer) {
+			if (sName.size() >= nNameBufferSize)
+				throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iName = 0; iName < sName.size(); iName++)
+				pNameBuffer[iName] = sName[iName];
+			pNameBuffer[sName.size()] = 0;
+		}
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCEnvResult libmcenv_build_getbuilduuid(LibMCEnv_Build pBuild, const LibMCEnv_uint32 nBuildUUIDBufferSize, LibMCEnv_uint32* pBuildUUIDNeededChars, char * pBuildUUIDBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pBuild;
+
+	try {
+		if ( (!pBuildUUIDBuffer) && !(pBuildUUIDNeededChars) )
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sBuildUUID("");
+		IBuild* pIBuild = dynamic_cast<IBuild*>(pIBaseClass);
+		if (!pIBuild)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pBuildUUIDBuffer == nullptr);
+		if (isCacheCall) {
+			sBuildUUID = pIBuild->GetBuildUUID();
+
+			pIBuild->_setCache (new ParameterCache_1<std::string> (sBuildUUID));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuild->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sBuildUUID);
+			pIBuild->_setCache (nullptr);
+		}
+		
+		if (pBuildUUIDNeededChars)
+			*pBuildUUIDNeededChars = (LibMCEnv_uint32) (sBuildUUID.size()+1);
+		if (pBuildUUIDBuffer) {
+			if (sBuildUUID.size() >= nBuildUUIDBufferSize)
+				throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iBuildUUID = 0; iBuildUUID < sBuildUUID.size(); iBuildUUID++)
+				pBuildUUIDBuffer[iBuildUUID] = sBuildUUID[iBuildUUID];
+			pBuildUUIDBuffer[sBuildUUID.size()] = 0;
+		}
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCEnvResult libmcenv_build_getstorageuuid(LibMCEnv_Build pBuild, const LibMCEnv_uint32 nStorageUUIDBufferSize, LibMCEnv_uint32* pStorageUUIDNeededChars, char * pStorageUUIDBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pBuild;
+
+	try {
+		if ( (!pStorageUUIDBuffer) && !(pStorageUUIDNeededChars) )
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sStorageUUID("");
+		IBuild* pIBuild = dynamic_cast<IBuild*>(pIBaseClass);
+		if (!pIBuild)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pStorageUUIDBuffer == nullptr);
+		if (isCacheCall) {
+			sStorageUUID = pIBuild->GetStorageUUID();
+
+			pIBuild->_setCache (new ParameterCache_1<std::string> (sStorageUUID));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuild->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sStorageUUID);
+			pIBuild->_setCache (nullptr);
+		}
+		
+		if (pStorageUUIDNeededChars)
+			*pStorageUUIDNeededChars = (LibMCEnv_uint32) (sStorageUUID.size()+1);
+		if (pStorageUUIDBuffer) {
+			if (sStorageUUID.size() >= nStorageUUIDBufferSize)
+				throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iStorageUUID = 0; iStorageUUID < sStorageUUID.size(); iStorageUUID++)
+				pStorageUUIDBuffer[iStorageUUID] = sStorageUUID[iStorageUUID];
+			pStorageUUIDBuffer[sStorageUUID.size()] = 0;
+		}
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCEnvResult libmcenv_build_getstoragesha256(LibMCEnv_Build pBuild, const LibMCEnv_uint32 nSHA256BufferSize, LibMCEnv_uint32* pSHA256NeededChars, char * pSHA256Buffer)
+{
+	IBase* pIBaseClass = (IBase *)pBuild;
 
 	try {
-		if ( (!pPartUUIDBuffer) && !(pPartUUIDNeededChars) )
+		if ( (!pSHA256Buffer) && !(pSHA256NeededChars) )
 			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		std::string sPartUUID("");
-		IToolpathLayer* pIToolpathLayer = dynamic_cast<IToolpathLayer*>(pIBaseClass);
-		if (!pIToolpathLayer)
+		std::string sSHA256("");
+		IBuild* pIBuild = dynamic_cast<IBuild*>(pIBaseClass);
+		if (!pIBuild)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		bool isCacheCall = (pPartUUIDBuffer == nullptr);
+		bool isCacheCall = (pSHA256Buffer == nullptr);
 		if (isCacheCall) {
-			sPartUUID = pIToolpathLayer->GetSegmentPartUUID(nIndex);
+			sSHA256 = pIBuild->GetStorageSHA256();
 
-			pIToolpathLayer->_setCache (new ParameterCache_1<std::string> (sPartUUID));
+			pIBuild->_setCache (new ParameterCache_1<std::string> (sSHA256));
 		}
 		else {
-			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIToolpathLayer->_getCache ());
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuild->_getCache ());
 			if (cache == nullptr)
 				throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
-			cache->retrieveData (sPartUUID);
-			pIToolpathLayer->_setCache (nullptr);
+			cache->retrieveData (sSHA256);
+			pIBuild->_setCache (nullptr);
 		}
 		
-		if (pPartUUIDNeededChars)
-			*pPartUUIDNeededChars = (LibMCEnv_uint32) (sPartUUID.size()+1);
-		if (pPartUUIDBuffer) {
-			if (sPartUUID.size() >= nPartUUIDBufferSize)
+		if (pSHA256NeededChars)
+			*pSHA256NeededChars = (LibMCEnv_uint32) (sSHA256.size()+1);
+		if (pSHA256Buffer) {
+			if (sSHA256.size() >= nSHA256BufferSize)
 				throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_BUFFERTOOSMALL);
-			for (size_t iPartUUID = 0; iPartUUID < sPartUUID.size(); iPartUUID++)
-				pPartUUIDBuffer[iPartUUID] = sPartUUID[iPartUUID];
-			pPartUUIDBuffer[sPartUUID.size()] = 0;
+			for (size_t iSHA256 = 0; iSHA256 < sSHA256.size(); iSHA256++)
+				pSHA256Buffer[iSHA256] = sSHA256[iSHA256];
+			pSHA256Buffer[sSHA256.size()] = 0;
 		}
 		return LIBMCENV_SUCCESS;
 	}
@@ -281,18 +764,18 @@ LibMCEnvResult libmcenv_toolpathlayer_getsegmentpartuuid(LibMCEnv_ToolpathLayer
 	}
 }
 
-LibMCEnvResult libmcenv_toolpathlayer_getsegmentpointdata(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_uint32 nIndex, const LibMCEnv_uint64 nPointDataBufferSize, LibMCEnv_uint64* pPointDataNeededCount, sLibMCEnvPosition2D * pPointDataBuffer)
+LibMCEnvResult libmcenv_build_getlayercount(LibMCEnv_Build pBuild, LibMCEnv_uint32 * pLayerCount)
 {
-	IBase* pIBaseClass = (IBase *)pToolpathLayer;
+	IBase* pIBaseClass = (IBase *)pBuild;
 
 	try {
-		if ((!pPointDataBuffer) && !(pPointDataNeededCount))
+		if (pLayerCount == nullptr)
 			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		IToolpathLayer* pIToolpathLayer = dynamic_cast<IToolpathLayer*>(pIBaseClass);
-		if (!pIToolpathLayer)
+		IBuild* pIBuild = dynamic_cast<IBuild*>(pIBaseClass);
+		if (!pIBuild)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pIToolpathLayer->GetSegmentPointData(nIndex, nPointDataBufferSize, pPointDataNeededCount, pPointDataBuffer);
+		*pLayerCount = pIBuild->GetLayerCount();
 
 		return LIBMCENV_SUCCESS;
 	}
@@ -307,45 +790,67 @@ LibMCEnvResult libmcenv_toolpathlayer_getsegmentpointdata(LibMCEnv_ToolpathLayer
 	}
 }
 
+LibMCEnvResult libmcenv_build_loadtoolpath(LibMCEnv_Build pBuild)
+{
+	IBase* pIBaseClass = (IBase *)pBuild;
 
-/*************************************************************************************************************************
- Class implementation for ToolpathAccessor
-**************************************************************************************************************************/
-LibMCEnvResult libmcenv_toolpathaccessor_getuuid(LibMCEnv_ToolpathAccessor pToolpathAccessor, const LibMCEnv_uint32 nUUIDBufferSize, LibMCEnv_uint32* pUUIDNeededChars, char * pUUIDBuffer)
+	try {
+		IBuild* pIBuild = dynamic_cast<IBuild*>(pIBaseClass);
+		if (!pIBuild)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		pIBuild->LoadToolpath();
+
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCEnvResult libmcenv_build_unloadtoolpath(LibMCEnv_Build pBuild)
 {
-	IBase* pIBaseClass = (IBase *)pToolpathAccessor;
+	IBase* pIBaseClass = (IBase *)pBuild;
 
 	try {
-		if ( (!pUUIDBuffer) && !(pUUIDNeededChars) )
-			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		std::string sUUID("");
-		IToolpathAccessor* pIToolpathAccessor = dynamic_cast<IToolpathAccessor*>(pIBaseClass);
-		if (!pIToolpathAccessor)
+		IBuild* pIBuild = dynamic_cast<IBuild*>(pIBaseClass);
+		if (!pIBuild)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		bool isCacheCall = (pUUIDBuffer == nullptr);
-		if (isCacheCall) {
-			sUUID = pIToolpathAccessor->GetUUID();
+		pIBuild->UnloadToolpath();
 
-			pIToolpathAccessor->_setCache (new ParameterCache_1<std::string> (sUUID));
-		}
-		else {
-			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIToolpathAccessor->_getCache ());
-			if (cache == nullptr)
-				throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
-			cache->retrieveData (sUUID);
-			pIToolpathAccessor->_setCache (nullptr);
-		}
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCEnvResult libmcenv_build_toolpathisloaded(LibMCEnv_Build pBuild, bool * pIsLoaded)
+{
+	IBase* pIBaseClass = (IBase *)pBuild;
+
+	try {
+		if (pIsLoaded == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		IBuild* pIBuild = dynamic_cast<IBuild*>(pIBaseClass);
+		if (!pIBuild)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		if (pUUIDNeededChars)
-			*pUUIDNeededChars = (LibMCEnv_uint32) (sUUID.size()+1);
-		if (pUUIDBuffer) {
-			if (sUUID.size() >= nUUIDBufferSize)
-				throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_BUFFERTOOSMALL);
-			for (size_t iUUID = 0; iUUID < sUUID.size(); iUUID++)
-				pUUIDBuffer[iUUID] = sUUID[iUUID];
-			pUUIDBuffer[sUUID.size()] = 0;
-		}
+		*pIsLoaded = pIBuild->ToolpathIsLoaded();
+
 		return LIBMCENV_SUCCESS;
 	}
 	catch (ELibMCEnvInterfaceException & Exception) {
@@ -359,19 +864,21 @@ LibMCEnvResult libmcenv_toolpathaccessor_getuuid(LibMCEnv_ToolpathAccessor pTool
 	}
 }
 
-LibMCEnvResult libmcenv_toolpathaccessor_getlayercount(LibMCEnv_ToolpathAccessor pToolpathAccessor, LibMCEnv_uint32 * pLayerCount)
+LibMCEnvResult libmcenv_build_createtoolpathaccessor(LibMCEnv_Build pBuild, LibMCEnv_ToolpathAccessor * pToolpathInstance)
 {
-	IBase* pIBaseClass = (IBase *)pToolpathAccessor;
+	IBase* pIBaseClass = (IBase *)pBuild;
 
 	try {
-		if (pLayerCount == nullptr)
+		if (pToolpathInstance == nullptr)
 			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		IToolpathAccessor* pIToolpathAccessor = dynamic_cast<IToolpathAccessor*>(pIBaseClass);
-		if (!pIToolpathAccessor)
+		IBase* pBaseToolpathInstance(nullptr);
+		IBuild* pIBuild = dynamic_cast<IBuild*>(pIBaseClass);
+		if (!pIBuild)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		*pLayerCount = pIToolpathAccessor->GetLayerCount();
+		pBaseToolpathInstance = pIBuild->CreateToolpathAccessor();
 
+		*pToolpathInstance = (IBase*)(pBaseToolpathInstance);
 		return LIBMCENV_SUCCESS;
 	}
 	catch (ELibMCEnvInterfaceException & Exception) {
@@ -385,21 +892,49 @@ LibMCEnvResult libmcenv_toolpathaccessor_getlayercount(LibMCEnv_ToolpathAccessor
 	}
 }
 
-LibMCEnvResult libmcenv_toolpathaccessor_loadlayer(LibMCEnv_ToolpathAccessor pToolpathAccessor, LibMCEnv_uint32 nLayerIndex, LibMCEnv_ToolpathLayer * pLayerData)
+LibMCEnvResult libmcenv_build_addbinarydata(LibMCEnv_Build pBuild, const char * pName, const char * pMIMEType, LibMCEnv_uint64 nContentBufferSize, const LibMCEnv_uint8 * pContentBuffer, const LibMCEnv_uint32 nDataUUIDBufferSize, LibMCEnv_uint32* pDataUUIDNeededChars, char * pDataUUIDBuffer)
 {
-	IBase* pIBaseClass = (IBase *)pToolpathAccessor;
+	IBase* pIBaseClass = (IBase *)pBuild;
 
 	try {
-		if (pLayerData == nullptr)
+		if (pName == nullptr)
 			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		IBase* pBaseLayerData(nullptr);
-		IToolpathAccessor* pIToolpathAccessor = dynamic_cast<IToolpathAccessor*>(pIBaseClass);
-		if (!pIToolpathAccessor)
+		if (pMIMEType == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		if ( (!pContentBuffer) && (nContentBufferSize>0))
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		if ( (!pDataUUIDBuffer) && !(pDataUUIDNeededChars) )
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sName(pName);
+		std::string sMIMEType(pMIMEType);
+		std::string sDataUUID("");
+		IBuild* pIBuild = dynamic_cast<IBuild*>(pIBaseClass);
+		if (!pIBuild)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pBaseLayerData = pIToolpathAccessor->LoadLayer(nLayerIndex);
+		bool isCacheCall = (pDataUUIDBuffer == nullptr);
+		if (isCacheCall) {
+			sDataUUID = pIBuild->AddBinaryData(sName, sMIMEType, nContentBufferSize, pContentBuffer);
 
-		*pLayerData = (IBase*)(pBaseLayerData);
+			pIBuild->_setCache (new ParameterCache_1<std::string> (sDataUUID));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIBuild->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sDataUUID);
+			pIBuild->_setCache (nullptr);
+		}
+		
+		if (pDataUUIDNeededChars)
+			*pDataUUIDNeededChars = (LibMCEnv_uint32) (sDataUUID.size()+1);
+		if (pDataUUIDBuffer) {
+			if (sDataUUID.size() >= nDataUUIDBufferSize)
+				throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iDataUUID = 0; iDataUUID < sDataUUID.size(); iDataUUID++)
+				pDataUUIDBuffer[iDataUUID] = sDataUUID[iDataUUID];
+			pDataUUIDBuffer[sDataUUID.size()] = 0;
+		}
 		return LIBMCENV_SUCCESS;
 	}
 	catch (ELibMCEnvInterfaceException & Exception) {
@@ -619,6 +1154,36 @@ LibMCEnvResult libmcenv_signaltrigger_setstring(LibMCEnv_SignalTrigger pSignalTr
 	}
 }
 
+LibMCEnvResult libmcenv_signaltrigger_setuuid(LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, const char * pValue)
+{
+	IBase* pIBaseClass = (IBase *)pSignalTrigger;
+
+	try {
+		if (pName == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		if (pValue == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sName(pName);
+		std::string sValue(pValue);
+		ISignalTrigger* pISignalTrigger = dynamic_cast<ISignalTrigger*>(pIBaseClass);
+		if (!pISignalTrigger)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		pISignalTrigger->SetUUID(sName, sValue);
+
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
 LibMCEnvResult libmcenv_signaltrigger_setdouble(LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, LibMCEnv_double dValue)
 {
 	IBase* pIBaseClass = (IBase *)pSignalTrigger;
@@ -751,6 +1316,57 @@ LibMCEnvResult libmcenv_signaltrigger_getstringresult(LibMCEnv_SignalTrigger pSi
 	}
 }
 
+LibMCEnvResult libmcenv_signaltrigger_getuuidresult(LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pSignalTrigger;
+
+	try {
+		if (pName == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		if ( (!pValueBuffer) && !(pValueNeededChars) )
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sName(pName);
+		std::string sValue("");
+		ISignalTrigger* pISignalTrigger = dynamic_cast<ISignalTrigger*>(pIBaseClass);
+		if (!pISignalTrigger)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pValueBuffer == nullptr);
+		if (isCacheCall) {
+			sValue = pISignalTrigger->GetUUIDResult(sName);
+
+			pISignalTrigger->_setCache (new ParameterCache_1<std::string> (sValue));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pISignalTrigger->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sValue);
+			pISignalTrigger->_setCache (nullptr);
+		}
+		
+		if (pValueNeededChars)
+			*pValueNeededChars = (LibMCEnv_uint32) (sValue.size()+1);
+		if (pValueBuffer) {
+			if (sValue.size() >= nValueBufferSize)
+				throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iValue = 0; iValue < sValue.size(); iValue++)
+				pValueBuffer[iValue] = sValue[iValue];
+			pValueBuffer[sValue.size()] = 0;
+		}
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
 LibMCEnvResult libmcenv_signaltrigger_getdoubleresult(LibMCEnv_SignalTrigger pSignalTrigger, const char * pName, LibMCEnv_double * pValue)
 {
 	IBase* pIBaseClass = (IBase *)pSignalTrigger;
@@ -1010,7 +1626,58 @@ LibMCEnvResult libmcenv_signalhandler_getstatemachine(LibMCEnv_SignalHandler pSi
 	}
 }
 
-LibMCEnvResult libmcenv_signalhandler_getstring(LibMCEnv_SignalHandler pSignalHandler, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer)
+LibMCEnvResult libmcenv_signalhandler_getstring(LibMCEnv_SignalHandler pSignalHandler, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pSignalHandler;
+
+	try {
+		if (pName == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		if ( (!pValueBuffer) && !(pValueNeededChars) )
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sName(pName);
+		std::string sValue("");
+		ISignalHandler* pISignalHandler = dynamic_cast<ISignalHandler*>(pIBaseClass);
+		if (!pISignalHandler)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pValueBuffer == nullptr);
+		if (isCacheCall) {
+			sValue = pISignalHandler->GetString(sName);
+
+			pISignalHandler->_setCache (new ParameterCache_1<std::string> (sValue));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pISignalHandler->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sValue);
+			pISignalHandler->_setCache (nullptr);
+		}
+		
+		if (pValueNeededChars)
+			*pValueNeededChars = (LibMCEnv_uint32) (sValue.size()+1);
+		if (pValueBuffer) {
+			if (sValue.size() >= nValueBufferSize)
+				throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iValue = 0; iValue < sValue.size(); iValue++)
+				pValueBuffer[iValue] = sValue[iValue];
+			pValueBuffer[sValue.size()] = 0;
+		}
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCEnvResult libmcenv_signalhandler_getuuid(LibMCEnv_SignalHandler pSignalHandler, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer)
 {
 	IBase* pIBaseClass = (IBase *)pSignalHandler;
 
@@ -1027,7 +1694,7 @@ LibMCEnvResult libmcenv_signalhandler_getstring(LibMCEnv_SignalHandler pSignalHa
 		
 		bool isCacheCall = (pValueBuffer == nullptr);
 		if (isCacheCall) {
-			sValue = pISignalHandler->GetString(sName);
+			sValue = pISignalHandler->GetUUID(sName);
 
 			pISignalHandler->_setCache (new ParameterCache_1<std::string> (sValue));
 		}
@@ -1178,6 +1845,36 @@ LibMCEnvResult libmcenv_signalhandler_setstringresult(LibMCEnv_SignalHandler pSi
 	}
 }
 
+LibMCEnvResult libmcenv_signalhandler_setuuidresult(LibMCEnv_SignalHandler pSignalHandler, const char * pName, const char * pValue)
+{
+	IBase* pIBaseClass = (IBase *)pSignalHandler;
+
+	try {
+		if (pName == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		if (pValue == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sName(pName);
+		std::string sValue(pValue);
+		ISignalHandler* pISignalHandler = dynamic_cast<ISignalHandler*>(pIBaseClass);
+		if (!pISignalHandler)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		pISignalHandler->SetUUIDResult(sName, sValue);
+
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
 LibMCEnvResult libmcenv_signalhandler_setdoubleresult(LibMCEnv_SignalHandler pSignalHandler, const char * pName, LibMCEnv_double dValue)
 {
 	IBase* pIBaseClass = (IBase *)pSignalHandler;
@@ -1263,7 +1960,7 @@ LibMCEnvResult libmcenv_signalhandler_setboolresult(LibMCEnv_SignalHandler pSign
 /*************************************************************************************************************************
  Class implementation for StateEnvironment
 **************************************************************************************************************************/
-LibMCEnvResult libmcenv_stateenvironment_createsignal(LibMCEnv_StateEnvironment pStateEnvironment, const char * pMachineInstance, const char * pSignalName, LibMCEnv_SignalTrigger * pSignalInstance)
+LibMCEnvResult libmcenv_stateenvironment_preparesignal(LibMCEnv_StateEnvironment pStateEnvironment, const char * pMachineInstance, const char * pSignalName, LibMCEnv_SignalTrigger * pSignalInstance)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
@@ -1281,7 +1978,7 @@ LibMCEnvResult libmcenv_stateenvironment_createsignal(LibMCEnv_StateEnvironment
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pBaseSignalInstance = pIStateEnvironment->CreateSignal(sMachineInstance, sSignalName);
+		pBaseSignalInstance = pIStateEnvironment->PrepareSignal(sMachineInstance, sSignalName);
 
 		*pSignalInstance = (IBase*)(pBaseSignalInstance);
 		return LIBMCENV_SUCCESS;
@@ -1412,47 +2109,24 @@ LibMCEnvResult libmcenv_stateenvironment_createdriveraccess(LibMCEnv_StateEnviro
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_loadtoolpath(LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID)
+LibMCEnvResult libmcenv_stateenvironment_getbuildjob(LibMCEnv_StateEnvironment pStateEnvironment, const char * pBuildUUID, LibMCEnv_Build * pBuildInstance)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
 	try {
-		if (pToolpathUUID == nullptr)
+		if (pBuildUUID == nullptr)
 			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		std::string sToolpathUUID(pToolpathUUID);
-		IStateEnvironment* pIStateEnvironment = dynamic_cast<IStateEnvironment*>(pIBaseClass);
-		if (!pIStateEnvironment)
-			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
-		
-		pIStateEnvironment->LoadToolpath(sToolpathUUID);
-
-		return LIBMCENV_SUCCESS;
-	}
-	catch (ELibMCEnvInterfaceException & Exception) {
-		return handleLibMCEnvException(pIBaseClass, Exception);
-	}
-	catch (std::exception & StdException) {
-		return handleStdException(pIBaseClass, StdException);
-	}
-	catch (...) {
-		return handleUnhandledException(pIBaseClass);
-	}
-}
-
-LibMCEnvResult libmcenv_stateenvironment_unloadtoolpath(LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID)
-{
-	IBase* pIBaseClass = (IBase *)pStateEnvironment;
-
-	try {
-		if (pToolpathUUID == nullptr)
+		if (pBuildInstance == nullptr)
 			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		std::string sToolpathUUID(pToolpathUUID);
+		std::string sBuildUUID(pBuildUUID);
+		IBase* pBaseBuildInstance(nullptr);
 		IStateEnvironment* pIStateEnvironment = dynamic_cast<IStateEnvironment*>(pIBaseClass);
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pIStateEnvironment->UnloadToolpath(sToolpathUUID);
+		pBaseBuildInstance = pIStateEnvironment->GetBuildJob(sBuildUUID);
 
+		*pBuildInstance = (IBase*)(pBaseBuildInstance);
 		return LIBMCENV_SUCCESS;
 	}
 	catch (ELibMCEnvInterfaceException & Exception) {
@@ -1490,24 +2164,20 @@ LibMCEnvResult libmcenv_stateenvironment_unloadalltoolpathes(LibMCEnv_StateEnvir
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_createtoolpathaccessor(LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID, LibMCEnv_ToolpathAccessor * pToolpathInstance)
+LibMCEnvResult libmcenv_stateenvironment_setnextstate(LibMCEnv_StateEnvironment pStateEnvironment, const char * pStateName)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
 	try {
-		if (pToolpathUUID == nullptr)
-			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		if (pToolpathInstance == nullptr)
+		if (pStateName == nullptr)
 			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		std::string sToolpathUUID(pToolpathUUID);
-		IBase* pBaseToolpathInstance(nullptr);
+		std::string sStateName(pStateName);
 		IStateEnvironment* pIStateEnvironment = dynamic_cast<IStateEnvironment*>(pIBaseClass);
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pBaseToolpathInstance = pIStateEnvironment->CreateToolpathAccessor(sToolpathUUID);
+		pIStateEnvironment->SetNextState(sStateName);
 
-		*pToolpathInstance = (IBase*)(pBaseToolpathInstance);
 		return LIBMCENV_SUCCESS;
 	}
 	catch (ELibMCEnvInterfaceException & Exception) {
@@ -1521,21 +2191,19 @@ LibMCEnvResult libmcenv_stateenvironment_createtoolpathaccessor(LibMCEnv_StateEn
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_toolpathisloaded(LibMCEnv_StateEnvironment pStateEnvironment, const char * pToolpathUUID, bool * pIsLoaded)
+LibMCEnvResult libmcenv_stateenvironment_logmessage(LibMCEnv_StateEnvironment pStateEnvironment, const char * pLogString)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
 	try {
-		if (pToolpathUUID == nullptr)
-			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		if (pIsLoaded == nullptr)
+		if (pLogString == nullptr)
 			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		std::string sToolpathUUID(pToolpathUUID);
+		std::string sLogString(pLogString);
 		IStateEnvironment* pIStateEnvironment = dynamic_cast<IStateEnvironment*>(pIBaseClass);
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		*pIsLoaded = pIStateEnvironment->ToolpathIsLoaded(sToolpathUUID);
+		pIStateEnvironment->LogMessage(sLogString);
 
 		return LIBMCENV_SUCCESS;
 	}
@@ -1550,19 +2218,19 @@ LibMCEnvResult libmcenv_stateenvironment_toolpathisloaded(LibMCEnv_StateEnvironm
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_setnextstate(LibMCEnv_StateEnvironment pStateEnvironment, const char * pStateName)
+LibMCEnvResult libmcenv_stateenvironment_logwarning(LibMCEnv_StateEnvironment pStateEnvironment, const char * pLogString)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
 	try {
-		if (pStateName == nullptr)
+		if (pLogString == nullptr)
 			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		std::string sStateName(pStateName);
+		std::string sLogString(pLogString);
 		IStateEnvironment* pIStateEnvironment = dynamic_cast<IStateEnvironment*>(pIBaseClass);
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pIStateEnvironment->SetNextState(sStateName);
+		pIStateEnvironment->LogWarning(sLogString);
 
 		return LIBMCENV_SUCCESS;
 	}
@@ -1577,7 +2245,7 @@ LibMCEnvResult libmcenv_stateenvironment_setnextstate(LibMCEnv_StateEnvironment
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_logmessage(LibMCEnv_StateEnvironment pStateEnvironment, const char * pLogString)
+LibMCEnvResult libmcenv_stateenvironment_loginfo(LibMCEnv_StateEnvironment pStateEnvironment, const char * pLogString)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
@@ -1589,7 +2257,7 @@ LibMCEnvResult libmcenv_stateenvironment_logmessage(LibMCEnv_StateEnvironment pS
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pIStateEnvironment->LogMessage(sLogString);
+		pIStateEnvironment->LogInfo(sLogString);
 
 		return LIBMCENV_SUCCESS;
 	}
@@ -1604,19 +2272,16 @@ LibMCEnvResult libmcenv_stateenvironment_logmessage(LibMCEnv_StateEnvironment pS
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_logwarning(LibMCEnv_StateEnvironment pStateEnvironment, const char * pLogString)
+LibMCEnvResult libmcenv_stateenvironment_sleep(LibMCEnv_StateEnvironment pStateEnvironment, LibMCEnv_uint32 nDelay)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
 	try {
-		if (pLogString == nullptr)
-			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		std::string sLogString(pLogString);
 		IStateEnvironment* pIStateEnvironment = dynamic_cast<IStateEnvironment*>(pIBaseClass);
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pIStateEnvironment->LogWarning(sLogString);
+		pIStateEnvironment->Sleep(nDelay);
 
 		return LIBMCENV_SUCCESS;
 	}
@@ -1631,19 +2296,18 @@ LibMCEnvResult libmcenv_stateenvironment_logwarning(LibMCEnv_StateEnvironment pS
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_loginfo(LibMCEnv_StateEnvironment pStateEnvironment, const char * pLogString)
+LibMCEnvResult libmcenv_stateenvironment_checkfortermination(LibMCEnv_StateEnvironment pStateEnvironment, bool * pShallTerminate)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
 	try {
-		if (pLogString == nullptr)
+		if (pShallTerminate == nullptr)
 			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		std::string sLogString(pLogString);
 		IStateEnvironment* pIStateEnvironment = dynamic_cast<IStateEnvironment*>(pIBaseClass);
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pIStateEnvironment->LogInfo(sLogString);
+		*pShallTerminate = pIStateEnvironment->CheckForTermination();
 
 		return LIBMCENV_SUCCESS;
 	}
@@ -1658,16 +2322,22 @@ LibMCEnvResult libmcenv_stateenvironment_loginfo(LibMCEnv_StateEnvironment pStat
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_sleep(LibMCEnv_StateEnvironment pStateEnvironment, LibMCEnv_uint32 nDelay)
+LibMCEnvResult libmcenv_stateenvironment_storestring(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const char * pValue)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
 	try {
+		if (pName == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		if (pValue == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sName(pName);
+		std::string sValue(pValue);
 		IStateEnvironment* pIStateEnvironment = dynamic_cast<IStateEnvironment*>(pIBaseClass);
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pIStateEnvironment->Sleep(nDelay);
+		pIStateEnvironment->StoreString(sName, sValue);
 
 		return LIBMCENV_SUCCESS;
 	}
@@ -1682,18 +2352,22 @@ LibMCEnvResult libmcenv_stateenvironment_sleep(LibMCEnv_StateEnvironment pStateE
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_checkfortermination(LibMCEnv_StateEnvironment pStateEnvironment, bool * pShallTerminate)
+LibMCEnvResult libmcenv_stateenvironment_storeuuid(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const char * pValue)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
 	try {
-		if (pShallTerminate == nullptr)
+		if (pName == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		if (pValue == nullptr)
 			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sName(pName);
+		std::string sValue(pValue);
 		IStateEnvironment* pIStateEnvironment = dynamic_cast<IStateEnvironment*>(pIBaseClass);
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		*pShallTerminate = pIStateEnvironment->CheckForTermination();
+		pIStateEnvironment->StoreUUID(sName, sValue);
 
 		return LIBMCENV_SUCCESS;
 	}
@@ -1708,22 +2382,19 @@ LibMCEnvResult libmcenv_stateenvironment_checkfortermination(LibMCEnv_StateEnvir
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_storestring(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const char * pValue)
+LibMCEnvResult libmcenv_stateenvironment_storeinteger(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, LibMCEnv_int64 nValue)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
 	try {
 		if (pName == nullptr)
 			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
-		if (pValue == nullptr)
-			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
 		std::string sName(pName);
-		std::string sValue(pValue);
 		IStateEnvironment* pIStateEnvironment = dynamic_cast<IStateEnvironment*>(pIBaseClass);
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pIStateEnvironment->StoreString(sName, sValue);
+		pIStateEnvironment->StoreInteger(sName, nValue);
 
 		return LIBMCENV_SUCCESS;
 	}
@@ -1738,7 +2409,7 @@ LibMCEnvResult libmcenv_stateenvironment_storestring(LibMCEnv_StateEnvironment p
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_storeinteger(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, LibMCEnv_int64 nValue)
+LibMCEnvResult libmcenv_stateenvironment_storedouble(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, LibMCEnv_double dValue)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
@@ -1750,7 +2421,7 @@ LibMCEnvResult libmcenv_stateenvironment_storeinteger(LibMCEnv_StateEnvironment
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pIStateEnvironment->StoreInteger(sName, nValue);
+		pIStateEnvironment->StoreDouble(sName, dValue);
 
 		return LIBMCENV_SUCCESS;
 	}
@@ -1765,7 +2436,7 @@ LibMCEnvResult libmcenv_stateenvironment_storeinteger(LibMCEnv_StateEnvironment
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_storedouble(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, LibMCEnv_double dValue)
+LibMCEnvResult libmcenv_stateenvironment_storebool(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, bool bValue)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
@@ -1777,7 +2448,7 @@ LibMCEnvResult libmcenv_stateenvironment_storedouble(LibMCEnv_StateEnvironment p
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pIStateEnvironment->StoreDouble(sName, dValue);
+		pIStateEnvironment->StoreBool(sName, bValue);
 
 		return LIBMCENV_SUCCESS;
 	}
@@ -1792,7 +2463,7 @@ LibMCEnvResult libmcenv_stateenvironment_storedouble(LibMCEnv_StateEnvironment p
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_storebool(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, bool bValue)
+LibMCEnvResult libmcenv_stateenvironment_storesignal(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, LibMCEnv_SignalHandler pHandler)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
@@ -1800,11 +2471,16 @@ LibMCEnvResult libmcenv_stateenvironment_storebool(LibMCEnv_StateEnvironment pSt
 		if (pName == nullptr)
 			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
 		std::string sName(pName);
+		IBase* pIBaseClassHandler = (IBase *)pHandler;
+		ISignalHandler* pIHandler = dynamic_cast<ISignalHandler*>(pIBaseClassHandler);
+		if (!pIHandler)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDCAST);
+		
 		IStateEnvironment* pIStateEnvironment = dynamic_cast<IStateEnvironment*>(pIBaseClass);
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pIStateEnvironment->StoreBool(sName, bValue);
+		pIStateEnvironment->StoreSignal(sName, pIHandler);
 
 		return LIBMCENV_SUCCESS;
 	}
@@ -1819,25 +2495,44 @@ LibMCEnvResult libmcenv_stateenvironment_storebool(LibMCEnv_StateEnvironment pSt
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_storesignal(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, LibMCEnv_SignalHandler pHandler)
+LibMCEnvResult libmcenv_stateenvironment_retrievestring(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
 	try {
 		if (pName == nullptr)
 			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		if ( (!pValueBuffer) && !(pValueNeededChars) )
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
 		std::string sName(pName);
-		IBase* pIBaseClassHandler = (IBase *)pHandler;
-		ISignalHandler* pIHandler = dynamic_cast<ISignalHandler*>(pIBaseClassHandler);
-		if (!pIHandler)
-			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDCAST);
-		
+		std::string sValue("");
 		IStateEnvironment* pIStateEnvironment = dynamic_cast<IStateEnvironment*>(pIBaseClass);
 		if (!pIStateEnvironment)
 			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
 		
-		pIStateEnvironment->StoreSignal(sName, pIHandler);
+		bool isCacheCall = (pValueBuffer == nullptr);
+		if (isCacheCall) {
+			sValue = pIStateEnvironment->RetrieveString(sName);
 
+			pIStateEnvironment->_setCache (new ParameterCache_1<std::string> (sValue));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIStateEnvironment->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sValue);
+			pIStateEnvironment->_setCache (nullptr);
+		}
+		
+		if (pValueNeededChars)
+			*pValueNeededChars = (LibMCEnv_uint32) (sValue.size()+1);
+		if (pValueBuffer) {
+			if (sValue.size() >= nValueBufferSize)
+				throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iValue = 0; iValue < sValue.size(); iValue++)
+				pValueBuffer[iValue] = sValue[iValue];
+			pValueBuffer[sValue.size()] = 0;
+		}
 		return LIBMCENV_SUCCESS;
 	}
 	catch (ELibMCEnvInterfaceException & Exception) {
@@ -1851,7 +2546,7 @@ LibMCEnvResult libmcenv_stateenvironment_storesignal(LibMCEnv_StateEnvironment p
 	}
 }
 
-LibMCEnvResult libmcenv_stateenvironment_retrievestring(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer)
+LibMCEnvResult libmcenv_stateenvironment_retrieveuuid(LibMCEnv_StateEnvironment pStateEnvironment, const char * pName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
 
@@ -1868,7 +2563,7 @@ LibMCEnvResult libmcenv_stateenvironment_retrievestring(LibMCEnv_StateEnvironmen
 		
 		bool isCacheCall = (pValueBuffer == nullptr);
 		if (isCacheCall) {
-			sValue = pIStateEnvironment->RetrieveString(sName);
+			sValue = pIStateEnvironment->RetrieveUUID(sName);
 
 			pIStateEnvironment->_setCache (new ParameterCache_1<std::string> (sValue));
 		}
@@ -2080,6 +2775,39 @@ LibMCEnvResult libmcenv_stateenvironment_setstringparameter(LibMCEnv_StateEnviro
 	}
 }
 
+LibMCEnvResult libmcenv_stateenvironment_setuuidparameter(LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, const char * pValue)
+{
+	IBase* pIBaseClass = (IBase *)pStateEnvironment;
+
+	try {
+		if (pParameterGroup == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		if (pParameterName == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		if (pValue == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sParameterGroup(pParameterGroup);
+		std::string sParameterName(pParameterName);
+		std::string sValue(pValue);
+		IStateEnvironment* pIStateEnvironment = dynamic_cast<IStateEnvironment*>(pIBaseClass);
+		if (!pIStateEnvironment)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		pIStateEnvironment->SetUUIDParameter(sParameterGroup, sParameterName, sValue);
+
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
 LibMCEnvResult libmcenv_stateenvironment_setdoubleparameter(LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, LibMCEnv_double dValue)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
@@ -2224,6 +2952,60 @@ LibMCEnvResult libmcenv_stateenvironment_getstringparameter(LibMCEnv_StateEnviro
 	}
 }
 
+LibMCEnvResult libmcenv_stateenvironment_getuuidparameter(LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, const LibMCEnv_uint32 nValueBufferSize, LibMCEnv_uint32* pValueNeededChars, char * pValueBuffer)
+{
+	IBase* pIBaseClass = (IBase *)pStateEnvironment;
+
+	try {
+		if (pParameterGroup == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		if (pParameterName == nullptr)
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		if ( (!pValueBuffer) && !(pValueNeededChars) )
+			throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_INVALIDPARAM);
+		std::string sParameterGroup(pParameterGroup);
+		std::string sParameterName(pParameterName);
+		std::string sValue("");
+		IStateEnvironment* pIStateEnvironment = dynamic_cast<IStateEnvironment*>(pIBaseClass);
+		if (!pIStateEnvironment)
+			throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+		
+		bool isCacheCall = (pValueBuffer == nullptr);
+		if (isCacheCall) {
+			sValue = pIStateEnvironment->GetUUIDParameter(sParameterGroup, sParameterName);
+
+			pIStateEnvironment->_setCache (new ParameterCache_1<std::string> (sValue));
+		}
+		else {
+			auto cache = dynamic_cast<ParameterCache_1<std::string>*> (pIStateEnvironment->_getCache ());
+			if (cache == nullptr)
+				throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDCAST);
+			cache->retrieveData (sValue);
+			pIStateEnvironment->_setCache (nullptr);
+		}
+		
+		if (pValueNeededChars)
+			*pValueNeededChars = (LibMCEnv_uint32) (sValue.size()+1);
+		if (pValueBuffer) {
+			if (sValue.size() >= nValueBufferSize)
+				throw ELibMCEnvInterfaceException (LIBMCENV_ERROR_BUFFERTOOSMALL);
+			for (size_t iValue = 0; iValue < sValue.size(); iValue++)
+				pValueBuffer[iValue] = sValue[iValue];
+			pValueBuffer[sValue.size()] = 0;
+		}
+		return LIBMCENV_SUCCESS;
+	}
+	catch (ELibMCEnvInterfaceException & Exception) {
+		return handleLibMCEnvException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
 LibMCEnvResult libmcenv_stateenvironment_getdoubleparameter(LibMCEnv_StateEnvironment pStateEnvironment, const char * pParameterGroup, const char * pParameterName, LibMCEnv_double * pValue)
 {
 	IBase* pIBaseClass = (IBase *)pStateEnvironment;
@@ -2343,16 +3125,46 @@ LibMCEnvResult LibMCEnv::Impl::LibMCEnv_GetProcAddress (const char * pProcName,
 		*ppProcAddress = (void*) &libmcenv_toolpathlayer_getsegmentinfo;
 	if (sProcName == "libmcenv_toolpathlayer_getsegmentprofileuuid") 
 		*ppProcAddress = (void*) &libmcenv_toolpathlayer_getsegmentprofileuuid;
+	if (sProcName == "libmcenv_toolpathlayer_getsegmentprofilevalue") 
+		*ppProcAddress = (void*) &libmcenv_toolpathlayer_getsegmentprofilevalue;
+	if (sProcName == "libmcenv_toolpathlayer_getsegmentprofiletypedvalue") 
+		*ppProcAddress = (void*) &libmcenv_toolpathlayer_getsegmentprofiletypedvalue;
 	if (sProcName == "libmcenv_toolpathlayer_getsegmentpartuuid") 
 		*ppProcAddress = (void*) &libmcenv_toolpathlayer_getsegmentpartuuid;
 	if (sProcName == "libmcenv_toolpathlayer_getsegmentpointdata") 
 		*ppProcAddress = (void*) &libmcenv_toolpathlayer_getsegmentpointdata;
-	if (sProcName == "libmcenv_toolpathaccessor_getuuid") 
-		*ppProcAddress = (void*) &libmcenv_toolpathaccessor_getuuid;
+	if (sProcName == "libmcenv_toolpathlayer_getzvalue") 
+		*ppProcAddress = (void*) &libmcenv_toolpathlayer_getzvalue;
+	if (sProcName == "libmcenv_toolpathlayer_getunits") 
+		*ppProcAddress = (void*) &libmcenv_toolpathlayer_getunits;
+	if (sProcName == "libmcenv_toolpathaccessor_getstorageuuid") 
+		*ppProcAddress = (void*) &libmcenv_toolpathaccessor_getstorageuuid;
 	if (sProcName == "libmcenv_toolpathaccessor_getlayercount") 
 		*ppProcAddress = (void*) &libmcenv_toolpathaccessor_getlayercount;
 	if (sProcName == "libmcenv_toolpathaccessor_loadlayer") 
 		*ppProcAddress = (void*) &libmcenv_toolpathaccessor_loadlayer;
+	if (sProcName == "libmcenv_toolpathaccessor_getunits") 
+		*ppProcAddress = (void*) &libmcenv_toolpathaccessor_getunits;
+	if (sProcName == "libmcenv_build_getname") 
+		*ppProcAddress = (void*) &libmcenv_build_getname;
+	if (sProcName == "libmcenv_build_getbuilduuid") 
+		*ppProcAddress = (void*) &libmcenv_build_getbuilduuid;
+	if (sProcName == "libmcenv_build_getstorageuuid") 
+		*ppProcAddress = (void*) &libmcenv_build_getstorageuuid;
+	if (sProcName == "libmcenv_build_getstoragesha256") 
+		*ppProcAddress = (void*) &libmcenv_build_getstoragesha256;
+	if (sProcName == "libmcenv_build_getlayercount") 
+		*ppProcAddress = (void*) &libmcenv_build_getlayercount;
+	if (sProcName == "libmcenv_build_loadtoolpath") 
+		*ppProcAddress = (void*) &libmcenv_build_loadtoolpath;
+	if (sProcName == "libmcenv_build_unloadtoolpath") 
+		*ppProcAddress = (void*) &libmcenv_build_unloadtoolpath;
+	if (sProcName == "libmcenv_build_toolpathisloaded") 
+		*ppProcAddress = (void*) &libmcenv_build_toolpathisloaded;
+	if (sProcName == "libmcenv_build_createtoolpathaccessor") 
+		*ppProcAddress = (void*) &libmcenv_build_createtoolpathaccessor;
+	if (sProcName == "libmcenv_build_addbinarydata") 
+		*ppProcAddress = (void*) &libmcenv_build_addbinarydata;
 	if (sProcName == "libmcenv_signaltrigger_cantrigger") 
 		*ppProcAddress = (void*) &libmcenv_signaltrigger_cantrigger;
 	if (sProcName == "libmcenv_signaltrigger_trigger") 
@@ -2365,6 +3177,8 @@ LibMCEnvResult LibMCEnv::Impl::LibMCEnv_GetProcAddress (const char * pProcName,
 		*ppProcAddress = (void*) &libmcenv_signaltrigger_getstatemachine;
 	if (sProcName == "libmcenv_signaltrigger_setstring") 
 		*ppProcAddress = (void*) &libmcenv_signaltrigger_setstring;
+	if (sProcName == "libmcenv_signaltrigger_setuuid") 
+		*ppProcAddress = (void*) &libmcenv_signaltrigger_setuuid;
 	if (sProcName == "libmcenv_signaltrigger_setdouble") 
 		*ppProcAddress = (void*) &libmcenv_signaltrigger_setdouble;
 	if (sProcName == "libmcenv_signaltrigger_setinteger") 
@@ -2373,6 +3187,8 @@ LibMCEnvResult LibMCEnv::Impl::LibMCEnv_GetProcAddress (const char * pProcName,
 		*ppProcAddress = (void*) &libmcenv_signaltrigger_setbool;
 	if (sProcName == "libmcenv_signaltrigger_getstringresult") 
 		*ppProcAddress = (void*) &libmcenv_signaltrigger_getstringresult;
+	if (sProcName == "libmcenv_signaltrigger_getuuidresult") 
+		*ppProcAddress = (void*) &libmcenv_signaltrigger_getuuidresult;
 	if (sProcName == "libmcenv_signaltrigger_getdoubleresult") 
 		*ppProcAddress = (void*) &libmcenv_signaltrigger_getdoubleresult;
 	if (sProcName == "libmcenv_signaltrigger_getintegerresult") 
@@ -2389,6 +3205,8 @@ LibMCEnvResult LibMCEnv::Impl::LibMCEnv_GetProcAddress (const char * pProcName,
 		*ppProcAddress = (void*) &libmcenv_signalhandler_getstatemachine;
 	if (sProcName == "libmcenv_signalhandler_getstring") 
 		*ppProcAddress = (void*) &libmcenv_signalhandler_getstring;
+	if (sProcName == "libmcenv_signalhandler_getuuid") 
+		*ppProcAddress = (void*) &libmcenv_signalhandler_getuuid;
 	if (sProcName == "libmcenv_signalhandler_getdouble") 
 		*ppProcAddress = (void*) &libmcenv_signalhandler_getdouble;
 	if (sProcName == "libmcenv_signalhandler_getinteger") 
@@ -2397,30 +3215,26 @@ LibMCEnvResult LibMCEnv::Impl::LibMCEnv_GetProcAddress (const char * pProcName,
 		*ppProcAddress = (void*) &libmcenv_signalhandler_getbool;
 	if (sProcName == "libmcenv_signalhandler_setstringresult") 
 		*ppProcAddress = (void*) &libmcenv_signalhandler_setstringresult;
+	if (sProcName == "libmcenv_signalhandler_setuuidresult") 
+		*ppProcAddress = (void*) &libmcenv_signalhandler_setuuidresult;
 	if (sProcName == "libmcenv_signalhandler_setdoubleresult") 
 		*ppProcAddress = (void*) &libmcenv_signalhandler_setdoubleresult;
 	if (sProcName == "libmcenv_signalhandler_setintegerresult") 
 		*ppProcAddress = (void*) &libmcenv_signalhandler_setintegerresult;
 	if (sProcName == "libmcenv_signalhandler_setboolresult") 
 		*ppProcAddress = (void*) &libmcenv_signalhandler_setboolresult;
-	if (sProcName == "libmcenv_stateenvironment_createsignal") 
-		*ppProcAddress = (void*) &libmcenv_stateenvironment_createsignal;
+	if (sProcName == "libmcenv_stateenvironment_preparesignal") 
+		*ppProcAddress = (void*) &libmcenv_stateenvironment_preparesignal;
 	if (sProcName == "libmcenv_stateenvironment_waitforsignal") 
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_waitforsignal;
 	if (sProcName == "libmcenv_stateenvironment_getdriverlibrary") 
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_getdriverlibrary;
 	if (sProcName == "libmcenv_stateenvironment_createdriveraccess") 
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_createdriveraccess;
-	if (sProcName == "libmcenv_stateenvironment_loadtoolpath") 
-		*ppProcAddress = (void*) &libmcenv_stateenvironment_loadtoolpath;
-	if (sProcName == "libmcenv_stateenvironment_unloadtoolpath") 
-		*ppProcAddress = (void*) &libmcenv_stateenvironment_unloadtoolpath;
+	if (sProcName == "libmcenv_stateenvironment_getbuildjob") 
+		*ppProcAddress = (void*) &libmcenv_stateenvironment_getbuildjob;
 	if (sProcName == "libmcenv_stateenvironment_unloadalltoolpathes") 
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_unloadalltoolpathes;
-	if (sProcName == "libmcenv_stateenvironment_createtoolpathaccessor") 
-		*ppProcAddress = (void*) &libmcenv_stateenvironment_createtoolpathaccessor;
-	if (sProcName == "libmcenv_stateenvironment_toolpathisloaded") 
-		*ppProcAddress = (void*) &libmcenv_stateenvironment_toolpathisloaded;
 	if (sProcName == "libmcenv_stateenvironment_setnextstate") 
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_setnextstate;
 	if (sProcName == "libmcenv_stateenvironment_logmessage") 
@@ -2435,6 +3249,8 @@ LibMCEnvResult LibMCEnv::Impl::LibMCEnv_GetProcAddress (const char * pProcName,
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_checkfortermination;
 	if (sProcName == "libmcenv_stateenvironment_storestring") 
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_storestring;
+	if (sProcName == "libmcenv_stateenvironment_storeuuid") 
+		*ppProcAddress = (void*) &libmcenv_stateenvironment_storeuuid;
 	if (sProcName == "libmcenv_stateenvironment_storeinteger") 
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_storeinteger;
 	if (sProcName == "libmcenv_stateenvironment_storedouble") 
@@ -2445,6 +3261,8 @@ LibMCEnvResult LibMCEnv::Impl::LibMCEnv_GetProcAddress (const char * pProcName,
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_storesignal;
 	if (sProcName == "libmcenv_stateenvironment_retrievestring") 
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_retrievestring;
+	if (sProcName == "libmcenv_stateenvironment_retrieveuuid") 
+		*ppProcAddress = (void*) &libmcenv_stateenvironment_retrieveuuid;
 	if (sProcName == "libmcenv_stateenvironment_retrieveinteger") 
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_retrieveinteger;
 	if (sProcName == "libmcenv_stateenvironment_retrievedouble") 
@@ -2457,6 +3275,8 @@ LibMCEnvResult LibMCEnv::Impl::LibMCEnv_GetProcAddress (const char * pProcName,
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_clearstoredvalue;
 	if (sProcName == "libmcenv_stateenvironment_setstringparameter") 
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_setstringparameter;
+	if (sProcName == "libmcenv_stateenvironment_setuuidparameter") 
+		*ppProcAddress = (void*) &libmcenv_stateenvironment_setuuidparameter;
 	if (sProcName == "libmcenv_stateenvironment_setdoubleparameter") 
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_setdoubleparameter;
 	if (sProcName == "libmcenv_stateenvironment_setintegerparameter") 
@@ -2465,6 +3285,8 @@ LibMCEnvResult LibMCEnv::Impl::LibMCEnv_GetProcAddress (const char * pProcName,
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_setboolparameter;
 	if (sProcName == "libmcenv_stateenvironment_getstringparameter") 
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_getstringparameter;
+	if (sProcName == "libmcenv_stateenvironment_getuuidparameter") 
+		*ppProcAddress = (void*) &libmcenv_stateenvironment_getuuidparameter;
 	if (sProcName == "libmcenv_stateenvironment_getdoubleparameter") 
 		*ppProcAddress = (void*) &libmcenv_stateenvironment_getdoubleparameter;
 	if (sProcName == "libmcenv_stateenvironment_getintegerparameter") 
diff --git a/Framework/InterfacesCore/libmcenv_types.hpp b/Framework/InterfacesCore/libmcenv_types.hpp
index 3bba5918..be35dc2b 100644
--- a/Framework/InterfacesCore/libmcenv_types.hpp
+++ b/Framework/InterfacesCore/libmcenv_types.hpp
@@ -147,6 +147,7 @@ inline const char * LIBMCENV_GETERRORSTRING (LibMCEnvResult nErrorCode) {
 typedef LibMCEnvHandle LibMCEnv_Base;
 typedef LibMCEnvHandle LibMCEnv_ToolpathLayer;
 typedef LibMCEnvHandle LibMCEnv_ToolpathAccessor;
+typedef LibMCEnvHandle LibMCEnv_Build;
 typedef LibMCEnvHandle LibMCEnv_SignalTrigger;
 typedef LibMCEnvHandle LibMCEnv_SignalHandler;
 typedef LibMCEnvHandle LibMCEnv_StateEnvironment;
@@ -164,6 +165,17 @@ namespace LibMCEnv {
     Polyline = 3
   };
   
+  enum class eToolpathProfileValueType : LibMCEnv_int32 {
+    Custom = 0,
+    Speed = 1,
+    JumpSpeed = 2,
+    ExtrusionFactor = 3,
+    LaserPower = 4,
+    StartDelay = 5,
+    EndDelay = 6,
+    PolyDelay = 7
+  };
+  
   /*************************************************************************************************************************
    Declaration of structs
   **************************************************************************************************************************/
@@ -171,7 +183,7 @@ namespace LibMCEnv {
   #pragma pack (1)
   
   typedef struct {
-      LibMCEnv_single m_Coordinates[2];
+      LibMCEnv_int32 m_Coordinates[2];
   } sPosition2D;
   
   #pragma pack ()
@@ -180,6 +192,7 @@ namespace LibMCEnv {
 
 // define legacy C-names for enums, structs and function types
 typedef LibMCEnv::eToolpathSegmentType eLibMCEnvToolpathSegmentType;
+typedef LibMCEnv::eToolpathProfileValueType eLibMCEnvToolpathProfileValueType;
 typedef LibMCEnv::sPosition2D sLibMCEnvPosition2D;
 
 #endif // __LIBMCENV_TYPES_HEADER_CPP
diff --git a/Implementation/API/amc_api.cpp b/Implementation/API/amc_api.cpp
index b5c7c3b0..b1c2cf74 100644
--- a/Implementation/API/amc_api.cpp
+++ b/Implementation/API/amc_api.cpp
@@ -28,7 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
+#define __AMCIMPL_API_RESPONSE
+
 #include "amc_api.hpp"
+#include "amc_api_auth.hpp"
 #include "amc_api_handler.hpp"
 #include "amc_api_response.hpp"
 #include "libmc_interfaceexception.hpp"
@@ -49,95 +52,89 @@ CAPI::~CAPI()
 {
 }
 
-PAPIResponse CAPI::handleGetRequest(const std::string& sURI, uint32_t& nHTTPCode)
-{
-
-	try {
 
-		for (auto pHandler : m_ApiHandlers) {
-			std::string sBaseURI = pHandler->getBaseURI();
-			bool bIsMatch;
+PAPIHandler CAPI::getURIMatch(const std::string& sURI)
+{
+	for (auto pHandler : m_ApiHandlers) {
+		std::string sBaseURI = pHandler->getBaseURI();
+		bool bIsMatch;
 
-			if (sBaseURI.length() > 0) {
-				if (sBaseURI.length() < sURI.length()) {
-					std::string sSlashURI = sBaseURI + "/";
+		if (sBaseURI.length() > 0) {
+			if (sBaseURI.length() < sURI.length()) {
+				std::string sSlashURI = sBaseURI + "/";
 
-					bIsMatch = (sSlashURI == sURI.substr(0, sSlashURI.length()));
-				}
-				else {
-					bIsMatch = (sBaseURI == sURI);
-				}
+				bIsMatch = (sSlashURI == sURI.substr(0, sSlashURI.length()));
 			}
 			else {
-				bIsMatch = true;
-			}
-
-			if (bIsMatch) {
-				auto pResponse = pHandler->handleGetRequest(sURI);
-				if (pResponse.get() != nullptr) {
-					nHTTPCode = AMC_API_HTTP_SUCCESS;
-					return pResponse;
-				}
-
-				break;
+				bIsMatch = (sBaseURI == sURI);
 			}
 		}
+		else {
+			bIsMatch = true;
+		}
 
-		nHTTPCode = AMC_API_HTTP_NOTFOUND;
-		return makeError (LIBMC_ERROR_URLNOTFOUND, "url not found: " + sURI);
-	}
-	catch (ELibMCInterfaceException & IntfException) {
-		nHTTPCode = AMC_API_HTTP_BADREQUEST;
-		return makeError(IntfException.getErrorCode(), IntfException.what ());
-	}
-	catch (std::exception& StdException) {
-		nHTTPCode = AMC_API_HTTP_BADREQUEST;
-		return makeError(LIBMC_ERROR_GENERICBADREQUEST, StdException.what());
+		if (bIsMatch) {
+			return pHandler;
+		}
 	}
-}
 
-PAPIResponse CAPI::handlePostRequest(const std::string& sURI, const uint8_t* pBody, const size_t nStreamSize, uint32_t& nHTTPCode)
-{
-
-	try {
+	return nullptr;
+}
 
-		for (auto pHandler : m_ApiHandlers) {
-			std::string sBaseURI = pHandler->getBaseURI();
-			bool bIsMatch;
 
-			if (sBaseURI.length() < sURI.length()) {
-				std::string sSlashURI = sBaseURI + "/";
+bool CAPI::expectsRawBody(const std::string& sURI, const eAPIRequestType requestType)
+{
+	auto pHandler = getURIMatch(sURI);
+	if (pHandler.get() == nullptr)
+		return false;
 
-				bIsMatch = (sSlashURI == sURI.substr(0, sSlashURI.length()));
-			}
-			else {
-				bIsMatch = (sBaseURI == sURI);
-			}
+	return pHandler->expectsRawBody(sURI, requestType);
+}
 
-			if (bIsMatch) {
-				PAPIResponse pResponse = pHandler->handlePostRequest(sURI, pBody, nStreamSize);
-				if (pResponse.get() != nullptr) {
-					nHTTPCode = AMC_API_HTTP_SUCCESS;
-					return pResponse;
-				}
+PAPIResponse CAPI::handleRequest(const std::string& sURI, const eAPIRequestType requestType, const uint8_t* pData, uint64_t nCount, CAPIFormFields & pFormFields, PAPIAuth pAuth)
+{
+	auto pHandler = getURIMatch(sURI);
+	if (pHandler.get() == nullptr)
+		return makeError(AMC_API_HTTP_NOTFOUND, LIBMC_ERROR_URLNOTFOUND, "url not found: " + sURI);
 
-				break;
-			}
-		}
+	try {
+		
+		auto pResponse = pHandler->handleRequest (sURI, requestType, pFormFields, pData, nCount, pAuth);
 
-		nHTTPCode = AMC_API_HTTP_NOTFOUND;
-		return makeError(LIBMC_ERROR_URLNOTFOUND, "url not found" + sURI);
+		if (pResponse.get() == nullptr)
+			return makeError(AMC_API_HTTP_NOTFOUND, LIBMC_ERROR_URLNOTFOUND, "url not found: " + sURI);
+		
+		return pResponse;		
 	}
 	catch (ELibMCInterfaceException& IntfException) {
-		nHTTPCode = AMC_API_HTTP_BADREQUEST;
-		return makeError(IntfException.getErrorCode(), IntfException.what());
+		return makeError(AMC_API_HTTP_BADREQUEST, IntfException.getErrorCode(), IntfException.what());
 	}
 	catch (std::exception& StdException) {
-		nHTTPCode = AMC_API_HTTP_BADREQUEST;
-		return makeError(LIBMC_ERROR_GENERICBADREQUEST, StdException.what());
+		return makeError(AMC_API_HTTP_BADREQUEST, LIBMC_ERROR_GENERICBADREQUEST, StdException.what());
 	}
 }
 
+uint32_t CAPI::getFormDataFieldCount(const std::string& sURI, const eAPIRequestType requestType)
+{
+	auto pHandler = getURIMatch(sURI);
+	if (pHandler.get() == nullptr)
+		return false;
+
+	return pHandler->getFormDataFieldCount(sURI, requestType);
+
+}
+
+CAPIFieldDetails CAPI::getFormDataFieldDetails(const std::string& sURI, const eAPIRequestType requestType, const uint32_t nFieldIndex)
+{
+	auto pHandler = getURIMatch(sURI);
+	if (pHandler.get() == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_URLNOTFOUND);
+
+	return pHandler->getFormDataFieldDetails(sURI, requestType, nFieldIndex);
+
+}
+
+
 void CAPI::registerHandler(PAPIHandler pAPIHandler)
 {
 	if (pAPIHandler.get() == nullptr)
@@ -147,12 +144,12 @@ void CAPI::registerHandler(PAPIHandler pAPIHandler)
 }
 
 
-PAPIResponse CAPI::makeError(LibMCResult errorCode, const std::string& sErrorString)
+PAPIResponse CAPI::makeError(uint32_t nHTTPError, LibMCResult errorCode, const std::string& sErrorString)
 {
 	CJSONWriter writer;
 	writer.addString(AMC_API_KEY_PROTOCOL, AMC_API_PROTOCOL_ERROR);
 	writer.addString(AMC_API_KEY_VERSION, AMC_API_PROTOCOL_VERSION);
 	writer.addInteger(AMC_API_KEY_ERRORCODE, errorCode);
 	writer.addString(AMC_API_KEY_MESSAGE, sErrorString);
-	return std::make_shared<CAPIStringResponse> (AMC_API_CONTENTTYPE, writer.saveToString () );
+	return std::make_shared<CAPIStringResponse> (nHTTPError, AMC_API_CONTENTTYPE, writer.saveToString () );
 }
diff --git a/Implementation/API/amc_api.hpp b/Implementation/API/amc_api.hpp
index e09b8a8c..a00c702c 100644
--- a/Implementation/API/amc_api.hpp
+++ b/Implementation/API/amc_api.hpp
@@ -32,38 +32,43 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_API
 #define __AMC_API
 
-#include <list>
-#include <memory>
-#include <string>
-#include "amc_api_response.hpp"
-
+#include "header_protection.hpp"
+#include "amc_api_types.hpp"
 
 
 namespace AMC {
 
-	class CAPIHandler;
-	typedef std::shared_ptr<CAPIHandler> PAPIHandler;
-
-	class CAPI;
-	typedef std::shared_ptr<CAPI> PAPI;
+	amcDeclareDependingClass(CAPI, PAPI);
+	amcDeclareDependingClass(CAPIAuth, PAPIAuth);
+	amcDeclareDependingClass(CAPIHandler, PAPIHandler);
+	amcDeclareDependingClass(CAPIResponse, PAPIResponse);
+	amcDeclareDependingClass(CAPIFormFields, PAPIFormFields);	
+	amcDeclareDependingClass(CAPIFieldDetails, PAPIFieldDetails);
+	
 
 	class CAPI {
 	private:
 
 		std::list<PAPIHandler> m_ApiHandlers;
 
-		PAPIResponse makeError (int32_t errorCode, const std::string & sErrorString);
+		PAPIResponse makeError (uint32_t nHTTPError, int32_t errorCode, const std::string & sErrorString);
+
+		PAPIHandler getURIMatch (const std::string& sURI);
 			
 	public:
 
 		CAPI();
 
 		virtual ~CAPI();
-						
-		PAPIResponse handleGetRequest(const std::string& sURI, uint32_t & nHTTPCode);
+								
+		bool expectsRawBody(const std::string& sURI, const eAPIRequestType requestType);
+
+		PAPIResponse handleRequest(const std::string& sURI, const eAPIRequestType requestType, const uint8_t * pData, uint64_t nCount, CAPIFormFields & pFormFields, PAPIAuth pAuth);
+
+		uint32_t getFormDataFieldCount(const std::string& sURI, const eAPIRequestType requestType);
+
+		CAPIFieldDetails getFormDataFieldDetails(const std::string& sURI, const eAPIRequestType requestType, const uint32_t nFieldIndex);
 
-		PAPIResponse handlePostRequest(const std::string& sURI, const uint8_t * pBody, const size_t nStreamSize, uint32_t & nHTTPCode);
-		
 		void registerHandler (PAPIHandler pAPIHandler);
 
 	};
diff --git a/Implementation/API/amc_api_auth.cpp b/Implementation/API/amc_api_auth.cpp
new file mode 100644
index 00000000..5bcc33cf
--- /dev/null
+++ b/Implementation/API/amc_api_auth.cpp
@@ -0,0 +1,68 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "amc_api_auth.hpp"
+#include "libmc_interfaceexception.hpp"
+
+#include "common_utils.hpp"
+
+using namespace AMC;
+
+CAPIAuth::CAPIAuth(const std::string& sSessionUUID)
+	: m_sSessionUUID (AMCCommon::CUtils::normalizeUUIDString (sSessionUUID))
+{
+
+}
+
+CAPIAuth::~CAPIAuth()
+{
+
+}
+
+
+bool CAPIAuth::contextUUIDIsAuthorized(std::string& sContextUUID)
+{
+	return true;
+}
+
+std::string CAPIAuth::getSessionUUID()
+{
+	return m_sSessionUUID;
+}
+
+bool CAPIAuth::userIsAuthorized()
+{
+	return true;
+}
+
+std::string CAPIAuth::getUserName()
+{
+	return "user";
+}
diff --git a/Implementation/API/amc_api_auth.hpp b/Implementation/API/amc_api_auth.hpp
new file mode 100644
index 00000000..757283dc
--- /dev/null
+++ b/Implementation/API/amc_api_auth.hpp
@@ -0,0 +1,71 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_AUTH
+#define __AMC_AUTH
+
+
+#include <memory>
+#include <string>
+
+namespace AMC {
+
+	class CAPIAuth;
+	typedef std::shared_ptr<CAPIAuth> PAPIAuth;
+	
+
+	class CAPIAuth {
+	private:
+
+		std::string m_sSessionUUID;
+			
+	public:
+
+		CAPIAuth(const std::string & sSessionUUID);
+
+		virtual ~CAPIAuth();
+		
+		std::string getUserName ();
+
+		std::string getSessionUUID();
+
+		bool userIsAuthorized();
+
+		bool contextUUIDIsAuthorized(std::string & sContextUUID);
+								
+	};
+
+	
+}
+
+
+#endif //__AMC_AUTH
+
diff --git a/Implementation/API/amc_api_constants.hpp b/Implementation/API/amc_api_constants.hpp
index 4da3e706..a7b026fb 100644
--- a/Implementation/API/amc_api_constants.hpp
+++ b/Implementation/API/amc_api_constants.hpp
@@ -32,6 +32,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_API_CONSTANTS
 #define __AMC_API_CONSTANTS
 
+#ifndef __AMCIMPL_API_CONSTANTS
+#error this header should only be included in the implementation CPP files.
+#endif
+
 #define AMC_API_HTTP_SUCCESS 200
 #define AMC_API_HTTP_BADREQUEST 400
 #define AMC_API_HTTP_NOTFOUND 404
@@ -41,6 +45,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AMC_API_PROTOCOL_LOGS "com.autodesk.machinecontrol.logs"
 #define AMC_API_PROTOCOL_STATUS "com.autodesk.machinecontrol.status"
 #define AMC_API_PROTOCOL_SETUP "com.autodesk.machinecontrol.setup"
+#define AMC_API_PROTOCOL_UPLOAD "com.autodesk.machinecontrol.upload"
+#define AMC_API_PROTOCOL_BUILD "com.autodesk.machinecontrol.build"
+#define AMC_API_PROTOCOL_SIGNAL "com.autodesk.machinecontrol.signal"
 
 #define AMC_API_CONTENTTYPE "application/json"
 
@@ -60,6 +67,37 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AMC_API_KEY_SETUPPARAMETERGROUP_PARAMETERS "parameters"
 #define AMC_API_KEY_SETUPPARAMETER_NAME "name"
 #define AMC_API_KEY_SETUPPARAMETER_DESCRIPTION "description"
+#define AMC_API_KEY_UPLOAD_STREAMUUID "streamuuid"
+#define AMC_API_KEY_UPLOAD_CONTEXT "context"
+#define AMC_API_KEY_UPLOAD_NAME "name"
+#define AMC_API_KEY_UPLOAD_MIMETYPE "mimetype"
+#define AMC_API_KEY_UPLOAD_SIZE "size"
+#define AMC_API_KEY_UPLOAD_SHA256 "sha256"
+#define AMC_API_KEY_UPLOAD_DATA "data"
+#define AMC_API_KEY_UPLOAD_DATASIZE "size"
+#define AMC_API_KEY_UPLOAD_DATAOFFSET "offset"
+#define AMC_API_KEY_UPLOAD_CONTEXTUUID "contextuuid"
+#define AMC_API_KEY_UPLOAD_BUILDJOBARRAY "buildjobs"
+#define AMC_API_KEY_UPLOAD_BUILDJOBNAME "name"
+#define AMC_API_KEY_UPLOAD_BUILDJOBLAYERCOUNT "layercount"
+
+#define AMC_API_KEY_SIGNAL_INSTANCENAME "instancename"
+#define AMC_API_KEY_SIGNAL_SIGNALNAME "signalname"
+#define AMC_API_KEY_SIGNAL_SIGNALUUID "signaluuid"
+
+#define AMC_API_KEY_UI_APPNAME "appname"
+#define AMC_API_KEY_UI_COPYRIGHT "copyright"
+#define AMC_API_KEY_UI_MAINPAGE "mainpage"
+#define AMC_API_KEY_UI_SESSIONID "sessionid"
+#define AMC_API_KEY_UI_ICON "icon"
+#define AMC_API_KEY_UI_ID "id"
+#define AMC_API_KEY_UI_CAPTION "caption"
+#define AMC_API_KEY_UI_TARGETPAGE "targetpage"
+#define AMC_API_KEY_UI_MENUITEMS "menuitems"
+#define AMC_API_KEY_UI_TOOLBARITEMS "toolbaritems"
+
+#define AMC_API_KEY_BUILDUUID "builduuid"
+
 
 #define AMC_API_KEY_STATUSINSTANCE_NAME "name"
 #define AMC_API_KEY_STATUSINSTANCE_STATE "state"
diff --git a/Implementation/API/amc_api_factory.cpp b/Implementation/API/amc_api_factory.cpp
new file mode 100644
index 00000000..d8582a2c
--- /dev/null
+++ b/Implementation/API/amc_api_factory.cpp
@@ -0,0 +1,60 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "amc_api_factory.hpp"
+#include "libmc_interfaceexception.hpp"
+
+#include "API/amc_api.hpp"
+#include "API/amc_api_handler_logs.hpp"
+#include "API/amc_api_handler_upload.hpp"
+#include "API/amc_api_handler_setup.hpp"
+#include "API/amc_api_handler_status.hpp"
+#include "API/amc_api_handler_build.hpp"
+#include "API/amc_api_handler_root.hpp"
+#include "API/amc_api_handler_signal.hpp"
+#include "API/amc_api_handler_ui.hpp"
+
+using namespace AMC;
+CAPIFactory::CAPIFactory(PAPI pAPI, PSystemState pSystemState, std::vector <AMC::PStateMachineInstance>& MachineInstanceList)
+{
+	if (pAPI.get() == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+	if (pSystemState.get() == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+	pAPI->registerHandler(std::make_shared <CAPIHandler_Logs>(pSystemState->getLoggerInstance()));
+	pAPI->registerHandler(std::make_shared <CAPIHandler_Setup>(MachineInstanceList));
+	pAPI->registerHandler(std::make_shared <CAPIHandler_Status>(MachineInstanceList));
+	pAPI->registerHandler(std::make_shared <CAPIHandler_Upload>(pSystemState));
+	pAPI->registerHandler(std::make_shared <CAPIHandler_Build>(pSystemState));
+	pAPI->registerHandler(std::make_shared <CAPIHandler_Signal>(pSystemState));
+	pAPI->registerHandler(std::make_shared <CAPIHandler_UI>(pSystemState));
+}
+
diff --git a/Implementation/API/amc_api_factory.hpp b/Implementation/API/amc_api_factory.hpp
new file mode 100644
index 00000000..2cf8ce80
--- /dev/null
+++ b/Implementation/API/amc_api_factory.hpp
@@ -0,0 +1,60 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_API_FACTORY
+#define __AMC_API_FACTORY
+
+#include "header_protection.hpp"
+
+#include "amc_api_types.hpp"
+#include "amc_systemstate.hpp"
+#include <vector>
+
+namespace AMC {
+
+	amcDeclareDependingClass(CAPI, PAPI);
+	amcDeclareDependingClass(CStateMachineInstance, PStateMachineInstance);
+
+	class CAPIFactory {
+	private:
+			
+	public:
+
+		CAPIFactory(PAPI pAPI, PSystemState pSystemState, std::vector <AMC::PStateMachineInstance> & MachineInstanceList);
+
+	};
+
+	
+}
+
+
+#endif //__AMC_API_FACTORY
+
diff --git a/Implementation/API/amc_api_handler.cpp b/Implementation/API/amc_api_handler.cpp
new file mode 100644
index 00000000..1bbb4ecf
--- /dev/null
+++ b/Implementation/API/amc_api_handler.cpp
@@ -0,0 +1,139 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#include "amc_api_handler.hpp"
+#include "libmc_interfaceexception.hpp"
+
+namespace AMC {
+
+
+	CAPIFieldDetails::CAPIFieldDetails()
+		: m_sFieldName (), m_bIsFileData (false), m_bIsMandatory (false)
+	{
+
+	}
+
+	CAPIFieldDetails::CAPIFieldDetails(const std::string& sFieldName, const bool bIsFileData, const bool bIsMandatory)
+		: m_sFieldName (sFieldName), m_bIsFileData (bIsFileData), m_bIsMandatory (bIsMandatory)
+	{
+
+	}
+
+
+	CAPIFormFields::CAPIFormFields()
+	{
+
+	}
+
+	void CAPIFormFields::addDataField (const std::string& sName, std::shared_ptr<std::vector<uint8_t>> pData)
+	{
+		m_FileData.insert(std::make_pair (sName, pData));
+	}
+
+	bool CAPIFormFields::hasDataField(const std::string& sName)
+	{
+		auto iIter = m_FileData.find(sName);
+		return (iIter != m_FileData.end());
+	}
+
+	std::shared_ptr<std::vector<uint8_t>> CAPIFormFields::getDataField(const std::string& sName)
+	{
+		auto iIter = m_FileData.find(sName);
+		if (iIter == m_FileData.end())
+			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDFIELDNAME);
+
+		return iIter->second;
+	}
+
+
+	void CAPIFormFields::addStringField(const std::string& sName, const std::string& sValue)
+	{
+		m_StringData.insert(std::make_pair (sName, sValue));
+	}
+
+	bool CAPIFormFields::hasStringField(const std::string& sName)
+	{
+		auto iIter = m_StringData.find (sName);
+		return (iIter != m_StringData.end());
+	}
+
+	std::string CAPIFormFields::getStringField(const std::string& sName)
+	{
+		auto iIter = m_StringData.find(sName);
+		if (iIter == m_StringData.end())
+			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDFIELDNAME);
+
+		return iIter->second;
+	}
+
+	uint64_t CAPIFormFields::getUint64Field(const std::string& sName)
+	{
+		auto sString = getStringField(sName);
+		return std::stoull(sString);
+	}
+
+
+	CAPIHandler::CAPIHandler()
+	{
+		
+	}
+
+	CAPIHandler::~CAPIHandler()
+	{
+		
+	}
+				
+
+	bool CAPIHandler::expectsRawBody(const std::string& sURI, const eAPIRequestType requestType)
+	{
+		return false;
+	}
+
+	uint32_t CAPIHandler::getFormDataFieldCount(const std::string& sURI, const eAPIRequestType requestType)
+	{
+		return 0;
+	}
+
+	CAPIFieldDetails CAPIHandler::getFormDataFieldDetails(const std::string& sURI, const eAPIRequestType requestType, const uint32_t nFieldIndex)
+	{
+		throw ELibMCInterfaceException (LIBMC_ERROR_INVALIDINDEX);
+	}
+
+		
+	void CAPIHandler::writeJSONHeader(CJSONWriter & writer, const std::string & sProtocol)
+	{
+		writer.addString(AMC_API_KEY_PROTOCOL, sProtocol);
+		writer.addString(AMC_API_KEY_VERSION, AMC_API_PROTOCOL_VERSION);		
+	}
+
+	
+}
+
diff --git a/Implementation/API/amc_api_handler.hpp b/Implementation/API/amc_api_handler.hpp
index e3522f6f..6959c465 100644
--- a/Implementation/API/amc_api_handler.hpp
+++ b/Implementation/API/amc_api_handler.hpp
@@ -32,42 +32,78 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_API_HANDLER
 #define __AMC_API_HANDLER
 
+#define __AMCIMPL_API_CONSTANTS
+
 #include "amc_jsonwriter.hpp"
 #include "amc_api_constants.hpp"
 #include "amc_api_response.hpp"
+#include "amc_api_auth.hpp"
 
 #include <memory>
+#include <map>
 #include <vector>
 #include <string>
 
 namespace AMC {
 
+
+
 	class CAPIHandler;
 	typedef std::shared_ptr<CAPIHandler> PAPIHandler;
 
+	class CAPIFieldDetails {
+	public:
+		std::string m_sFieldName;
+		bool m_bIsFileData;
+		bool m_bIsMandatory;
+
+		CAPIFieldDetails();
+		CAPIFieldDetails(const std::string & sFieldName, const bool bIsFileData, const bool bIsMandatory);
+	};
+
+	class CAPIFormFields {
+	private:
+
+		std::map<std::string, std::shared_ptr <std::vector<uint8_t>>> m_FileData;
+		std::map<std::string, std::string> m_StringData;
+
+	public:
+		CAPIFormFields();
+
+		void addDataField(const std::string& sName, std::shared_ptr<std::vector<uint8_t>> pData);
+		bool hasDataField(const std::string& sName);
+		std::shared_ptr<std::vector<uint8_t>> getDataField(const std::string& sName);
+
+		void addStringField(const std::string& sName, const std::string& sValue);
+		bool hasStringField(const std::string& sName);
+		std::string getStringField(const std::string& sName);
+		uint64_t getUint64Field(const std::string& sName);
+
+
+	};
+
 	class CAPIHandler {
 	private:
+
+	protected:
 			
 	public:
 
-		CAPIHandler()
-		{}
+		CAPIHandler();
 
-		virtual ~CAPIHandler()
-		{}
+		virtual ~CAPIHandler();
 				
 		virtual std::string getBaseURI () = 0;
 
-		virtual PAPIResponse handleGetRequest(const std::string& sURI) = 0;
+		virtual PAPIResponse handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth) = 0;
+
+		virtual bool expectsRawBody(const std::string& sURI, const eAPIRequestType requestType);
 
-		virtual PAPIResponse handlePostRequest(const std::string& sURI, const uint8_t* pBodyData, const size_t nBodyDataSize) = 0;
+		virtual uint32_t getFormDataFieldCount(const std::string& sURI, const eAPIRequestType requestType);
 
+		virtual CAPIFieldDetails getFormDataFieldDetails(const std::string& sURI, const eAPIRequestType requestType, const uint32_t nFieldIndex);
 
-		virtual void writeJSONHeader(CJSONWriter & writer, const std::string & sProtocol)
-		{
-			writer.addString(AMC_API_KEY_PROTOCOL, sProtocol);
-			writer.addString(AMC_API_KEY_VERSION, AMC_API_PROTOCOL_VERSION);
-		}
+		virtual void writeJSONHeader(CJSONWriter& writer, const std::string& sProtocol);
 
 	};
 
diff --git a/Implementation/API/amc_api_handler_build.cpp b/Implementation/API/amc_api_handler_build.cpp
new file mode 100644
index 00000000..884d96ea
--- /dev/null
+++ b/Implementation/API/amc_api_handler_build.cpp
@@ -0,0 +1,199 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "amc_api_handler_build.hpp"
+#include "amc_api_jsonrequest.hpp"
+
+#include "libmc_interfaceexception.hpp"
+#include "libmcdata_dynamic.hpp"
+
+#include "amc_service_buildfileparsing.hpp"
+#include "amc_toolpathhandler.hpp"
+
+#include "common_utils.hpp"
+
+#include <vector>
+#include <memory>
+#include <string>
+#include <iostream>
+
+
+using namespace AMC;
+
+CAPIHandler_Build::CAPIHandler_Build(PSystemState pSystemState)
+	: m_pSystemState(pSystemState)
+{
+	if (pSystemState.get() == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+}
+
+CAPIHandler_Build::~CAPIHandler_Build()
+{
+	
+}
+				
+std::string CAPIHandler_Build::getBaseURI () 
+{
+	return "api/build";
+}
+
+APIHandler_BuildType CAPIHandler_Build::parseRequest(const std::string& sURI, const eAPIRequestType requestType, std::string& jobUUID)
+{
+	// Leave away base URI
+	auto sParameterString = AMCCommon::CUtils::toLowerString (sURI.substr(9));
+	jobUUID = "";
+
+	if (requestType == eAPIRequestType::rtPost) {
+
+		if (sParameterString == "/prepare") {
+			return btStartPrepareJob;
+		}
+	
+	}
+
+	if (requestType == eAPIRequestType::rtGet) {
+
+		if ((sParameterString == "/") || (sParameterString == "")) {
+			return btListJobs;
+		}
+
+	}
+
+
+	return btUnknown;
+}
+
+
+bool CAPIHandler_Build::expectsRawBody(const std::string& sURI, const eAPIRequestType requestType)
+{
+	std::string jobUUID;
+
+	switch (parseRequest(sURI, requestType, jobUUID)) {
+		case btStartPrepareJob:
+			return true;
+
+		default:
+			return false;
+	}
+}
+
+
+uint32_t CAPIHandler_Build::getFormDataFieldCount(const std::string& sURI, const eAPIRequestType requestType)
+{
+	return 0;	
+}
+
+CAPIFieldDetails CAPIHandler_Build::getFormDataFieldDetails(const std::string& sURI, const eAPIRequestType requestType, const uint32_t nFieldIndex)
+{
+	throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDINDEX);
+}
+
+void CAPIHandler_Build::handlePrepareJobRequest(CJSONWriter& writer, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth)
+{
+	if (pBodyData == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+	if (pAuth.get() == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+	CAPIJSONRequest jsonRequest(pBodyData, nBodyDataSize);
+
+	auto sBuildUUID = jsonRequest.getUUID(AMC_API_KEY_BUILDUUID, LIBMC_ERROR_INVALIDBUILDUUID);
+
+	auto pBuildJobHandler = m_pSystemState->buildJobHandler();
+	auto pBuildJob = pBuildJobHandler->RetrieveJob(sBuildUUID);
+
+	pBuildJob->StartValidating();
+
+	auto pServiceHandler = m_pSystemState->serviceHandler();
+	auto pLib3MFWrapper = m_pSystemState->toolpathHandler()->getLib3MFWrapper();
+
+	pServiceHandler->addServiceToQueue (std::make_shared <CService_BuildFileParsing> (pServiceHandler, pBuildJob, pLib3MFWrapper, pAuth->getUserName()));
+	
+}
+
+
+void CAPIHandler_Build::handleListJobsRequest(CJSONWriter& writer, PAPIAuth pAuth)
+{
+	if (pAuth.get() == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+
+	auto pBuildJobHandler = m_pSystemState->buildJobHandler();
+	auto pBuildJobIterator = pBuildJobHandler->ListJobsByStatus(LibMCData::eBuildJobStatus::Validated);
+
+	CJSONWriterArray jobJSONArray(writer);
+
+	while (pBuildJobIterator->MoveNext()) {
+		auto pBuildJob = pBuildJobIterator->GetCurrentJob();
+
+		CJSONWriterObject jobJSON(writer);
+		jobJSON.addString(AMC_API_KEY_UPLOAD_BUILDJOBNAME, pBuildJob->GetName ());
+		jobJSON.addInteger(AMC_API_KEY_UPLOAD_BUILDJOBLAYERCOUNT, pBuildJob->GetLayerCount());
+
+		jobJSONArray.addObject(jobJSON);
+	}
+
+	writer.addArray(AMC_API_KEY_UPLOAD_BUILDJOBARRAY, jobJSONArray);
+}
+
+
+
+PAPIResponse CAPIHandler_Build::handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth)
+{
+	std::string jobUUID;
+
+	auto buildType = parseRequest(sURI, requestType, jobUUID);
+
+	CJSONWriter writer;
+	writeJSONHeader(writer, AMC_API_PROTOCOL_BUILD);
+
+	switch (buildType) {
+	case btStartPrepareJob:
+		handlePrepareJobRequest(writer, pBodyData, nBodyDataSize, pAuth);
+		break;
+	case btListJobs:
+		handleListJobsRequest(writer, pAuth);
+		break;
+
+	default:
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+	}
+
+	return std::make_shared<CAPIStringResponse>(AMC_API_HTTP_SUCCESS, AMC_API_CONTENTTYPE, writer.saveToString());
+
+	return nullptr;
+}
+
+
+
+		
+
diff --git a/Implementation/API/amc_api_handler_build.hpp b/Implementation/API/amc_api_handler_build.hpp
new file mode 100644
index 00000000..3b6f6322
--- /dev/null
+++ b/Implementation/API/amc_api_handler_build.hpp
@@ -0,0 +1,82 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_API_HANDLER_BUILD
+#define __AMC_API_HANDLER_BUILD
+
+#include "amc_api_handler.hpp"
+#include "amc_logger.hpp"
+#include "amc_api_response.hpp"
+
+#include "amc_systemstate.hpp"
+
+namespace AMC {
+
+	enum APIHandler_BuildType {
+		btUnknown = 0,
+		btStartPrepareJob = 1,
+		btListJobs = 2
+	};
+
+	class CAPIHandler_Build : public CAPIHandler {
+	private:
+		
+		PSystemState m_pSystemState;
+
+		APIHandler_BuildType parseRequest(const std::string& sURI, const eAPIRequestType requestType, std::string& jobUUID);
+
+		void handlePrepareJobRequest(CJSONWriter& writer, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth);
+		void handleListJobsRequest(CJSONWriter& writer, PAPIAuth pAuth);
+
+	public:
+
+		CAPIHandler_Build(PSystemState pSystemState);
+
+		virtual ~CAPIHandler_Build();
+				
+		virtual std::string getBaseURI () override;
+
+		virtual PAPIResponse handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth) override;
+
+		virtual uint32_t getFormDataFieldCount(const std::string& sURI, const eAPIRequestType requestType) override;
+
+		virtual CAPIFieldDetails getFormDataFieldDetails(const std::string& sURI, const eAPIRequestType requestType, const uint32_t nFieldIndex) override;
+
+		virtual bool expectsRawBody(const std::string& sURI, const eAPIRequestType requestType) override;
+
+	};
+
+	
+}
+
+
+#endif //__AMC_API_HANDLER_BUILD
+
diff --git a/Implementation/API/amc_api_handler_logs.cpp b/Implementation/API/amc_api_handler_logs.cpp
index 2ee53f9c..7b81d48b 100644
--- a/Implementation/API/amc_api_handler_logs.cpp
+++ b/Implementation/API/amc_api_handler_logs.cpp
@@ -57,25 +57,22 @@ std::string CAPIHandler_Logs::getBaseURI ()
 	return "api/logs";
 }
 		
-PAPIResponse CAPIHandler_Logs::handleGetRequest(const std::string& sURI)
+PAPIResponse CAPIHandler_Logs::handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth)
 {
 	std::cout << sURI << std::endl;
-	std::string sURIParam = sURI.substr(9); // remove "api/logs/" from the URI...
-
-	uint32_t maxLogEntries = 32;
-	uint32_t nStartID = 0;	
-	if (sURIParam.length() > 0) {
-		nStartID = std::stoul(sURIParam);
-	}
 
+	if (requestType == eAPIRequestType::rtGet) {
+		std::string sURIParam = sURI.substr(9); // remove "api/logs/" from the URI...
 
+		uint32_t maxLogEntries = 32;
+		uint32_t nStartID = 0;
+		if (sURIParam.length() > 0) {
+			nStartID = std::stoul(sURIParam);
+		}
 
+	}
 
-	return nullptr;
-}
 
-PAPIResponse CAPIHandler_Logs::handlePostRequest(const std::string& sURI, const uint8_t* pBodyData, const size_t nBodyDataSize)
-{
 	return nullptr;
 }
 
diff --git a/Implementation/API/amc_api_handler_logs.hpp b/Implementation/API/amc_api_handler_logs.hpp
index 106e2617..55274f84 100644
--- a/Implementation/API/amc_api_handler_logs.hpp
+++ b/Implementation/API/amc_api_handler_logs.hpp
@@ -50,10 +50,8 @@ namespace AMC {
 				
 		virtual std::string getBaseURI () override;
 
-		virtual PAPIResponse handleGetRequest(const std::string& sURI) override;
+		virtual PAPIResponse handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth) override;
 
-		virtual PAPIResponse handlePostRequest(const std::string& sURI, const uint8_t * pBodyData, const size_t nBodyDataSize) override;
-		
 	};
 
 	
diff --git a/Implementation/API/amc_api_handler_root.cpp b/Implementation/API/amc_api_handler_root.cpp
index c8bab7a6..b009c289 100644
--- a/Implementation/API/amc_api_handler_root.cpp
+++ b/Implementation/API/amc_api_handler_root.cpp
@@ -214,21 +214,18 @@ std::string CAPIHandler_Root::getBaseURI ()
 	return "";
 }
 		
-PAPIResponse CAPIHandler_Root::handleGetRequest(const std::string& sURI)
+PAPIResponse CAPIHandler_Root::handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth)
 {
-	auto iIterator = m_FilesToServe.find(sURI);
-	if (iIterator != m_FilesToServe.end())
-		return iIterator->second;
 
-	return nullptr;
-}
+	if (requestType == eAPIRequestType::rtGet) {
+		auto iIterator = m_FilesToServe.find(sURI);
+		if (iIterator != m_FilesToServe.end())
+			return iIterator->second;
+	}
 
-PAPIResponse CAPIHandler_Root::handlePostRequest(const std::string& sURI, const uint8_t* pBodyData, const size_t nBodyDataSize)
-{
 	return nullptr;
 }
 
-
 void CAPIHandler_Root::LoadClientPackage(const uint64_t nZIPStreamBufferSize, const uint8_t* pZIPStreamBuffer)
 {
 	CAPIHandler_Root_ZIP ZipFile(nZIPStreamBufferSize, pZIPStreamBuffer);
diff --git a/Implementation/API/amc_api_handler_root.hpp b/Implementation/API/amc_api_handler_root.hpp
index 10557846..110af33b 100644
--- a/Implementation/API/amc_api_handler_root.hpp
+++ b/Implementation/API/amc_api_handler_root.hpp
@@ -51,9 +51,7 @@ namespace AMC {
 				
 		virtual std::string getBaseURI () override;
 		
-		virtual PAPIResponse handleGetRequest(const std::string& sURI) override;
-
-		virtual PAPIResponse handlePostRequest(const std::string& sURI, const uint8_t* pBodyData, const size_t nBodyDataSize) override;
+		virtual PAPIResponse handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth) override;
 
 		void LoadClientPackage(const uint64_t nZIPStreamBufferSize, const uint8_t* pZIPStreamBuffer);
 
diff --git a/Implementation/API/amc_api_handler_setup.cpp b/Implementation/API/amc_api_handler_setup.cpp
index 1f6cb46d..50228aba 100644
--- a/Implementation/API/amc_api_handler_setup.cpp
+++ b/Implementation/API/amc_api_handler_setup.cpp
@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
+#define __AMCIMPL_API_CONSTANTS
 
 #include "amc_api_handler_setup.hpp"
 #include "amc_api_constants.hpp"
@@ -52,82 +53,83 @@ std::string CAPIHandler_Setup::getBaseURI ()
 	return "api/setup";
 }
 		
-PAPIResponse CAPIHandler_Setup::handleGetRequest(const std::string& sURI)
+PAPIResponse CAPIHandler_Setup::handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth)
 {
-	CJSONWriter writer;	
-	writeJSONHeader(writer, AMC_API_PROTOCOL_SETUP);
-
-	if (!m_Instances.empty()) {
-		CJSONWriterArray instanceJSONArray(writer);
-
-		for (auto pInstance : m_Instances) {
-
-			CJSONWriterObject instanceJSONObject (writer);
-			instanceJSONObject.addString (AMC_API_KEY_SETUPINSTANCE_NAME, pInstance->getName());
-			instanceJSONObject.addString (AMC_API_KEY_SETUPINSTANCE_DESCRIPTION, pInstance->getDescription());
-			
-			CJSONWriterArray statesJSONArray(writer);
-			uint32_t nStateCount = pInstance->getStateCount();
-			for (uint32_t nStateIndex = 0; nStateIndex < nStateCount; nStateIndex++) {
-				CJSONWriterObject stateJSONObject(writer);
-				stateJSONObject.addString(AMC_API_KEY_SETUPSTATE_NAME, pInstance->getNameOfState(nStateIndex));
-
-				CJSONWriterArray outstateJSONArray(writer);
-				uint32_t nOutStateCount = pInstance->getOutstateCountOfState(nStateIndex);
-				for (uint32_t nOutStateIndex = 0; nOutStateIndex < nOutStateCount; nOutStateIndex++) {
-					outstateJSONArray.addString(pInstance->getOutstateNameOfState(nStateIndex, nOutStateIndex));
-				}
 
-				stateJSONObject.addArray(AMC_API_KEY_SETUPSTATE_OUTSTATES, outstateJSONArray);
+	if (requestType == eAPIRequestType::rtGet) {
+		CJSONWriter writer;
+		writeJSONHeader(writer, AMC_API_PROTOCOL_SETUP);
 
-				statesJSONArray.addObject(stateJSONObject);
+		if (!m_Instances.empty()) {
+			CJSONWriterArray instanceJSONArray(writer);
 
-			}
-			instanceJSONObject.addArray(AMC_API_KEY_SETUPSTATES, statesJSONArray);
+			for (auto pInstance : m_Instances) {
 
-			CJSONWriterArray parameterGroupsJSONArray(writer);
-			auto pParameterHandler = pInstance->getParameterHandler();
-			uint32_t nParameterGroupCount = pParameterHandler->getGroupCount();
+				CJSONWriterObject instanceJSONObject(writer);
+				instanceJSONObject.addString(AMC_API_KEY_SETUPINSTANCE_NAME, pInstance->getName());
+				instanceJSONObject.addString(AMC_API_KEY_SETUPINSTANCE_DESCRIPTION, pInstance->getDescription());
 
-			for (uint32_t nGroupIndex = 0; nGroupIndex < nParameterGroupCount; nGroupIndex++) {
-				auto pGroup = pParameterHandler->getGroup(nGroupIndex);
+				CJSONWriterArray statesJSONArray(writer);
+				uint32_t nStateCount = pInstance->getStateCount();
+				for (uint32_t nStateIndex = 0; nStateIndex < nStateCount; nStateIndex++) {
+					CJSONWriterObject stateJSONObject(writer);
+					stateJSONObject.addString(AMC_API_KEY_SETUPSTATE_NAME, pInstance->getNameOfState(nStateIndex));
 
-				CJSONWriterObject groupJSONObject(writer);
-				groupJSONObject.addString(AMC_API_KEY_SETUPPARAMETERGROUP_NAME, pGroup->getName ());
-				groupJSONObject.addString(AMC_API_KEY_SETUPPARAMETERGROUP_DESCRIPTION, pGroup->getDescription());
+					CJSONWriterArray outstateJSONArray(writer);
+					uint32_t nOutStateCount = pInstance->getOutstateCountOfState(nStateIndex);
+					for (uint32_t nOutStateIndex = 0; nOutStateIndex < nOutStateCount; nOutStateIndex++) {
+						outstateJSONArray.addString(pInstance->getOutstateNameOfState(nStateIndex, nOutStateIndex));
+					}
 
-				CJSONWriterArray parametersJSONArray(writer);
-				uint32_t nParameterCount = pGroup->getParameterCount();
-				for (uint32_t nParamIndex = 0; nParamIndex < nParameterCount; nParamIndex++) {
-					CJSONWriterObject parameterJSONObject(writer);
-					std::string sParamName, sParamDescription, sParamDefaultValue;
-					pGroup->getParameterInfo(nParamIndex, sParamName, sParamDescription, sParamDefaultValue);
-					parameterJSONObject.addString(AMC_API_KEY_SETUPPARAMETER_NAME, sParamName);
-					parameterJSONObject.addString(AMC_API_KEY_SETUPPARAMETER_DESCRIPTION, sParamDescription);
-					parametersJSONArray.addObject(parameterJSONObject);
+					stateJSONObject.addArray(AMC_API_KEY_SETUPSTATE_OUTSTATES, outstateJSONArray);
+
+					statesJSONArray.addObject(stateJSONObject);
 
 				}
-				groupJSONObject.addArray(AMC_API_KEY_SETUPPARAMETERGROUP_PARAMETERS, parametersJSONArray);
+				instanceJSONObject.addArray(AMC_API_KEY_SETUPSTATES, statesJSONArray);
 
-				parameterGroupsJSONArray.addObject(groupJSONObject);
-			}
+				CJSONWriterArray parameterGroupsJSONArray(writer);
+				auto pParameterHandler = pInstance->getParameterHandler();
+				uint32_t nParameterGroupCount = pParameterHandler->getGroupCount();
+
+				for (uint32_t nGroupIndex = 0; nGroupIndex < nParameterGroupCount; nGroupIndex++) {
+					auto pGroup = pParameterHandler->getGroup(nGroupIndex);
+
+					CJSONWriterObject groupJSONObject(writer);
+					groupJSONObject.addString(AMC_API_KEY_SETUPPARAMETERGROUP_NAME, pGroup->getName());
+					groupJSONObject.addString(AMC_API_KEY_SETUPPARAMETERGROUP_DESCRIPTION, pGroup->getDescription());
+
+					CJSONWriterArray parametersJSONArray(writer);
+					uint32_t nParameterCount = pGroup->getParameterCount();
+					for (uint32_t nParamIndex = 0; nParamIndex < nParameterCount; nParamIndex++) {
+						CJSONWriterObject parameterJSONObject(writer);
+						std::string sParamName, sParamDescription, sParamDefaultValue;
+						pGroup->getParameterInfo(nParamIndex, sParamName, sParamDescription, sParamDefaultValue);
+						parameterJSONObject.addString(AMC_API_KEY_SETUPPARAMETER_NAME, sParamName);
+						parameterJSONObject.addString(AMC_API_KEY_SETUPPARAMETER_DESCRIPTION, sParamDescription);
+						parametersJSONArray.addObject(parameterJSONObject);
+
+					}
+					groupJSONObject.addArray(AMC_API_KEY_SETUPPARAMETERGROUP_PARAMETERS, parametersJSONArray);
 
-			instanceJSONObject.addArray(AMC_API_KEY_SETUPPARAMETERGROUPS, parameterGroupsJSONArray);
+					parameterGroupsJSONArray.addObject(groupJSONObject);
+				}
+
+				instanceJSONObject.addArray(AMC_API_KEY_SETUPPARAMETERGROUPS, parameterGroupsJSONArray);
+
+				instanceJSONArray.addObject(instanceJSONObject);
+			}
 
-			instanceJSONArray.addObject(instanceJSONObject);
+			writer.addArray(AMC_API_KEY_SETUPINSTANCES, instanceJSONArray);
 		}
 
-		writer.addArray(AMC_API_KEY_SETUPINSTANCES, instanceJSONArray);
+		return std::make_shared<CAPIStringResponse>(AMC_API_HTTP_SUCCESS, AMC_API_CONTENTTYPE, writer.saveToString());
 	}
 
-	return std::make_shared<CAPIStringResponse> (AMC_API_CONTENTTYPE, writer.saveToString());
+	return nullptr;
 }
 
 
-PAPIResponse CAPIHandler_Setup::handlePostRequest(const std::string& sURI, const uint8_t* pBodyData, const size_t nBodyDataSize)
-{
-	return nullptr;
-}
 
 	
 
diff --git a/Implementation/API/amc_api_handler_setup.hpp b/Implementation/API/amc_api_handler_setup.hpp
index 5ff61811..cf7cb7a6 100644
--- a/Implementation/API/amc_api_handler_setup.hpp
+++ b/Implementation/API/amc_api_handler_setup.hpp
@@ -50,9 +50,7 @@ namespace AMC {
 				
 		virtual std::string getBaseURI () override;
 		
-		virtual PAPIResponse handleGetRequest(const std::string& sURI) override;
-
-		virtual PAPIResponse handlePostRequest(const std::string& sURI, const uint8_t* pBodyData, const size_t nBodyDataSize) override;
+		virtual PAPIResponse handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth) override;
 
 	};
 
diff --git a/Implementation/API/amc_api_handler_signal.cpp b/Implementation/API/amc_api_handler_signal.cpp
new file mode 100644
index 00000000..08af8533
--- /dev/null
+++ b/Implementation/API/amc_api_handler_signal.cpp
@@ -0,0 +1,178 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "amc_api_handler_signal.hpp"
+#include "amc_api_jsonrequest.hpp"
+
+#include "libmc_interfaceexception.hpp"
+#include "libmcdata_dynamic.hpp"
+
+#include "amc_service_buildfileparsing.hpp"
+#include "amc_toolpathhandler.hpp"
+#include "amc_statesignalhandler.hpp"
+
+#include "common_utils.hpp"
+
+#include <vector>
+#include <memory>
+#include <string>
+#include <iostream>
+
+
+using namespace AMC;
+
+CAPIHandler_Signal::CAPIHandler_Signal(PSystemState pSystemState)
+	: m_pSystemState(pSystemState)
+{
+	if (pSystemState.get() == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+}
+
+CAPIHandler_Signal::~CAPIHandler_Signal()
+{
+	
+}
+				
+std::string CAPIHandler_Signal::getBaseURI () 
+{
+	return "api/signal";
+}
+
+APIHandler_SignalType CAPIHandler_Signal::parseRequest(const std::string& sURI, const eAPIRequestType requestType, std::string& jobUUID)
+{
+	// Leave away base URI
+	auto sParameterString = AMCCommon::CUtils::toLowerString (sURI.substr (getBaseURI().length ()));
+	jobUUID = "";
+
+	if (requestType == eAPIRequestType::rtPost) {
+
+		if ((sParameterString == "/") || (sParameterString == "")) 
+			return APIHandler_SignalType::stSendSignal;
+	
+	}
+
+	return APIHandler_SignalType::stUnknown;
+}
+
+
+bool CAPIHandler_Signal::expectsRawBody(const std::string& sURI, const eAPIRequestType requestType)
+{
+	std::string jobUUID;
+
+	switch (parseRequest(sURI, requestType, jobUUID)) {
+		case APIHandler_SignalType::stSendSignal:
+			return true;
+
+		default:
+			return false;
+	}
+}
+
+
+uint32_t CAPIHandler_Signal::getFormDataFieldCount(const std::string& sURI, const eAPIRequestType requestType)
+{
+	return 0;	
+}
+
+CAPIFieldDetails CAPIHandler_Signal::getFormDataFieldDetails(const std::string& sURI, const eAPIRequestType requestType, const uint32_t nFieldIndex)
+{
+	throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDINDEX);
+}
+
+void CAPIHandler_Signal::handleSendSignalRequest(CJSONWriter& writer, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth)
+{
+	if (pBodyData == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+	if (pAuth.get() == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+	CAPIJSONRequest jsonRequest(pBodyData, nBodyDataSize);
+	auto sInstanceName = jsonRequest.getNameString(AMC_API_KEY_SIGNAL_INSTANCENAME, LIBMC_ERROR_MISSINGINSTANCENAME);
+	auto sSignalName = jsonRequest.getNameString(AMC_API_KEY_SIGNAL_SIGNALNAME, LIBMC_ERROR_MISSINGSIGNALNAME);
+
+	auto pSignalHandler = m_pSystemState->getStateSignalHandlerInstance();
+
+	if (!pSignalHandler->hasSignalDefinition(sInstanceName, sSignalName))
+		throw ELibMCInterfaceException (LIBMC_ERROR_SIGNALNOTFOUND);
+
+	auto pParameterGroup = std::make_shared<AMC::CParameterGroup>();
+
+	pSignalHandler->populateParameterGroup(sInstanceName, sSignalName, pParameterGroup.get());
+
+	auto nCount = pParameterGroup->getParameterCount();
+	for (uint32_t nIndex = 0; nIndex < nCount; nIndex++) {
+		std::string sParamName, sDescription, sDefaultValue;
+		pParameterGroup->getParameterInfo(nIndex, sParamName, sDescription, sDefaultValue);
+		auto sValue = jsonRequest.getRawString(sParamName, LIBMC_ERROR_MISSINGSIGNALPARAMETER);
+		pParameterGroup->setParameterValueByIndex(nIndex, sValue);
+	}
+
+	std::string sNewSignalUUID;
+
+	if (pSignalHandler->triggerSignal(sInstanceName, sSignalName, pParameterGroup->serializeToJSON (), sNewSignalUUID)) {
+		writer.addString(AMC_API_KEY_SIGNAL_SIGNALUUID, sNewSignalUUID);
+	} else
+		throw ELibMCInterfaceException(LIBMC_ERROR_COULDNOTSENDSIGNAL);
+	
+}
+
+
+
+
+PAPIResponse CAPIHandler_Signal::handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth)
+{
+	std::string jobUUID;
+
+	auto buildType = parseRequest(sURI, requestType, jobUUID);
+
+	CJSONWriter writer;
+	writeJSONHeader(writer, AMC_API_PROTOCOL_SIGNAL);
+
+	switch (buildType) {
+	case APIHandler_SignalType::stSendSignal:
+		handleSendSignalRequest(writer, pBodyData, nBodyDataSize, pAuth);
+		break;
+
+	default:
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+	}
+
+	return std::make_shared<CAPIStringResponse>(AMC_API_HTTP_SUCCESS, AMC_API_CONTENTTYPE, writer.saveToString());
+
+	return nullptr;
+}
+
+
+
+
+		
+
diff --git a/Implementation/API/amc_api_handler_signal.hpp b/Implementation/API/amc_api_handler_signal.hpp
new file mode 100644
index 00000000..a2b3d9d1
--- /dev/null
+++ b/Implementation/API/amc_api_handler_signal.hpp
@@ -0,0 +1,80 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_API_HANDLER_SIGNAL
+#define __AMC_API_HANDLER_SIGNAL
+
+#include "amc_api_handler.hpp"
+#include "amc_logger.hpp"
+#include "amc_api_response.hpp"
+
+#include "amc_systemstate.hpp"
+
+namespace AMC {
+
+	enum class APIHandler_SignalType {
+		stUnknown = 0,
+		stSendSignal = 1
+	};
+
+	class CAPIHandler_Signal : public CAPIHandler {
+	private:
+		
+		PSystemState m_pSystemState;
+
+		APIHandler_SignalType parseRequest(const std::string& sURI, const eAPIRequestType requestType, std::string& jobUUID);
+
+		void handleSendSignalRequest(CJSONWriter& writer, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth);
+
+	public:
+
+		CAPIHandler_Signal(PSystemState pSystemState);
+
+		virtual ~CAPIHandler_Signal();
+				
+		virtual std::string getBaseURI () override;
+
+		virtual PAPIResponse handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth) override;
+
+		virtual uint32_t getFormDataFieldCount(const std::string& sURI, const eAPIRequestType requestType) override;
+
+		virtual CAPIFieldDetails getFormDataFieldDetails(const std::string& sURI, const eAPIRequestType requestType, const uint32_t nFieldIndex) override;
+
+		virtual bool expectsRawBody(const std::string& sURI, const eAPIRequestType requestType) override;
+
+	};
+
+	
+}
+
+
+#endif //__AMC_API_HANDLER_SIGNAL
+
diff --git a/Implementation/API/amc_api_handler_status.cpp b/Implementation/API/amc_api_handler_status.cpp
index 664cce9b..2ec66874 100644
--- a/Implementation/API/amc_api_handler_status.cpp
+++ b/Implementation/API/amc_api_handler_status.cpp
@@ -54,63 +54,64 @@ std::string CAPIHandler_Status::getBaseURI ()
 	return "api/status";
 }
 		
-PAPIResponse CAPIHandler_Status::handleGetRequest(const std::string& sURI)
+PAPIResponse CAPIHandler_Status::handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth)
 {
-	CJSONWriter writer;
-	writeJSONHeader(writer, AMC_API_PROTOCOL_STATUS);
 
-	if (!m_Instances.empty()) {
-		CJSONWriterArray instanceJSONArray(writer);
+	if (requestType == eAPIRequestType::rtGet) {
 
-		for (auto pInstance : m_Instances) {
+		CJSONWriter writer;
+		writeJSONHeader(writer, AMC_API_PROTOCOL_STATUS);
 
-			CJSONWriterObject instanceJSONObject(writer);
-			instanceJSONObject.addString(AMC_API_KEY_STATUSINSTANCE_NAME, pInstance->getName());
-			instanceJSONObject.addString(AMC_API_KEY_STATUSINSTANCE_STATE, pInstance->getCurrentStateName());
+		if (!m_Instances.empty()) {
+			CJSONWriterArray instanceJSONArray(writer);
 
-			CJSONWriterArray parameterGroupsJSONArray(writer);
-			auto pParameterHandler = pInstance->getParameterHandler();
-			uint32_t nParameterGroupCount = pParameterHandler->getGroupCount();
+			for (auto pInstance : m_Instances) {
 
-			for (uint32_t nGroupIndex = 0; nGroupIndex < nParameterGroupCount; nGroupIndex++) {
-				auto pGroup = pParameterHandler->getGroup(nGroupIndex);
+				CJSONWriterObject instanceJSONObject(writer);
+				instanceJSONObject.addString(AMC_API_KEY_STATUSINSTANCE_NAME, pInstance->getName());
+				instanceJSONObject.addString(AMC_API_KEY_STATUSINSTANCE_STATE, pInstance->getCurrentStateName());
 
-				CJSONWriterObject groupJSONObject(writer);
-				groupJSONObject.addString(AMC_API_KEY_STATUSPARAMETERGROUP_NAME, pGroup->getName());
+				CJSONWriterArray parameterGroupsJSONArray(writer);
+				auto pParameterHandler = pInstance->getParameterHandler();
+				uint32_t nParameterGroupCount = pParameterHandler->getGroupCount();
 
-				CJSONWriterArray parametersJSONArray(writer);
-				uint32_t nParameterCount = pGroup->getParameterCount();
-				for (uint32_t nParamIndex = 0; nParamIndex < nParameterCount; nParamIndex++) {
-					CJSONWriterObject parameterJSONObject(writer);
-					std::string sParamName, sParamDescription, sParamDefaultValue;
-					pGroup->getParameterInfo(nParamIndex, sParamName, sParamDescription, sParamDefaultValue);
-					parameterJSONObject.addString(AMC_API_KEY_STATUSPARAMETER_NAME, sParamName);
-					parameterJSONObject.addString(AMC_API_KEY_STATUSPARAMETER_VALUE, pGroup->getParameterValueByIndex(nParamIndex));
-					parametersJSONArray.addObject(parameterJSONObject);
+				for (uint32_t nGroupIndex = 0; nGroupIndex < nParameterGroupCount; nGroupIndex++) {
+					auto pGroup = pParameterHandler->getGroup(nGroupIndex);
 
+					CJSONWriterObject groupJSONObject(writer);
+					groupJSONObject.addString(AMC_API_KEY_STATUSPARAMETERGROUP_NAME, pGroup->getName());
+
+					CJSONWriterArray parametersJSONArray(writer);
+					uint32_t nParameterCount = pGroup->getParameterCount();
+					for (uint32_t nParamIndex = 0; nParamIndex < nParameterCount; nParamIndex++) {
+						CJSONWriterObject parameterJSONObject(writer);
+						std::string sParamName, sParamDescription, sParamDefaultValue;
+						pGroup->getParameterInfo(nParamIndex, sParamName, sParamDescription, sParamDefaultValue);
+						parameterJSONObject.addString(AMC_API_KEY_STATUSPARAMETER_NAME, sParamName);
+						parameterJSONObject.addString(AMC_API_KEY_STATUSPARAMETER_VALUE, pGroup->getParameterValueByIndex(nParamIndex));
+						parametersJSONArray.addObject(parameterJSONObject);
+
+					}
+					groupJSONObject.addArray(AMC_API_KEY_STATUSPARAMETERGROUP_PARAMETERS, parametersJSONArray);
+
+					parameterGroupsJSONArray.addObject(groupJSONObject);
 				}
-				groupJSONObject.addArray(AMC_API_KEY_STATUSPARAMETERGROUP_PARAMETERS, parametersJSONArray);
 
-				parameterGroupsJSONArray.addObject(groupJSONObject);
-			}
+				instanceJSONObject.addArray(AMC_API_KEY_STATUSPARAMETERGROUPS, parameterGroupsJSONArray);
 
-			instanceJSONObject.addArray(AMC_API_KEY_STATUSPARAMETERGROUPS, parameterGroupsJSONArray);
+				instanceJSONArray.addObject(instanceJSONObject);
+			}
 
-			instanceJSONArray.addObject(instanceJSONObject);
+			writer.addArray(AMC_API_KEY_STATUSINSTANCES, instanceJSONArray);
 		}
 
-		writer.addArray(AMC_API_KEY_STATUSINSTANCES, instanceJSONArray);
+		return std::make_shared<CAPIStringResponse>(AMC_API_HTTP_SUCCESS, AMC_API_CONTENTTYPE, writer.saveToString());
 	}
 
-	return std::make_shared<CAPIStringResponse>(AMC_API_CONTENTTYPE, writer.saveToString());
-}
-
-
-PAPIResponse CAPIHandler_Status::handlePostRequest(const std::string& sURI, const uint8_t* pBodyData, const size_t nBodyDataSize)
-{
 	return nullptr;
 }
 
 
 
 
+
diff --git a/Implementation/API/amc_api_handler_status.hpp b/Implementation/API/amc_api_handler_status.hpp
index 968002bb..3bb9a6fb 100644
--- a/Implementation/API/amc_api_handler_status.hpp
+++ b/Implementation/API/amc_api_handler_status.hpp
@@ -51,9 +51,7 @@ namespace AMC {
 				
 		virtual std::string getBaseURI () override;
 		
-		virtual PAPIResponse handleGetRequest(const std::string& sURI) override;
-
-		virtual PAPIResponse handlePostRequest(const std::string& sURI, const uint8_t* pBodyData, const size_t nBodyDataSize) override;
+		virtual PAPIResponse handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth) override;
 
 	};
 
diff --git a/Implementation/API/amc_api_handler_ui.cpp b/Implementation/API/amc_api_handler_ui.cpp
new file mode 100644
index 00000000..6107d7b0
--- /dev/null
+++ b/Implementation/API/amc_api_handler_ui.cpp
@@ -0,0 +1,123 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "amc_api_handler_ui.hpp"
+#include "amc_api_jsonrequest.hpp"
+#include "amc_ui_handler.hpp"
+
+#include "libmc_interfaceexception.hpp"
+#include "libmcdata_dynamic.hpp"
+
+#include "common_utils.hpp"
+
+#include <vector>
+#include <memory>
+#include <string>
+#include <iostream>
+
+
+using namespace AMC;
+
+CAPIHandler_UI::CAPIHandler_UI(PSystemState pSystemState)
+	: m_pSystemState(pSystemState)
+{
+	if (pSystemState.get() == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+}
+
+CAPIHandler_UI::~CAPIHandler_UI()
+{
+	
+}
+				
+std::string CAPIHandler_UI::getBaseURI ()
+{
+	return "api/ui";
+}
+
+APIHandler_UIType CAPIHandler_UI::parseRequest(const std::string& sURI, const eAPIRequestType requestType)
+{
+	// Leave away base URI
+	auto sParameterString = AMCCommon::CUtils::toLowerString (sURI.substr(getBaseURI ().length ()));
+
+	if (requestType == eAPIRequestType::rtGet) {
+
+		if ((sParameterString == "/config/") || (sParameterString == "/config")) {
+			return APIHandler_UIType::utConfiguration;
+		}
+
+	}
+
+	return APIHandler_UIType::utUnknown;
+}
+
+
+
+
+void CAPIHandler_UI::handleConfigurationRequest(CJSONWriter& writer, PAPIAuth pAuth)
+{
+	if (pAuth.get() == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+	writer.addString(AMC_API_KEY_UI_SESSIONID, pAuth->getSessionUUID());
+	m_pSystemState->uiHandler()->writeToJSON(writer);
+
+}
+
+
+
+PAPIResponse CAPIHandler_UI::handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth)
+{
+
+	auto uiType = parseRequest(sURI, requestType);
+
+	CJSONWriter writer;
+	writeJSONHeader(writer, AMC_API_PROTOCOL_BUILD);
+
+	switch (uiType) {
+	case APIHandler_UIType::utConfiguration:
+		handleConfigurationRequest(writer, pAuth);
+		break;
+
+	default:
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+	}
+
+	return std::make_shared<CAPIStringResponse>(AMC_API_HTTP_SUCCESS, AMC_API_CONTENTTYPE, writer.saveToString());
+
+	return nullptr;
+}
+
+
+
+		
+
diff --git a/Implementation/API/amc_api_handler_ui.hpp b/Implementation/API/amc_api_handler_ui.hpp
new file mode 100644
index 00000000..a4cc3f49
--- /dev/null
+++ b/Implementation/API/amc_api_handler_ui.hpp
@@ -0,0 +1,74 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_API_HANDLER_UI
+#define __AMC_API_HANDLER_UI
+
+#include "amc_api_handler.hpp"
+#include "amc_logger.hpp"
+#include "amc_api_response.hpp"
+
+#include "amc_systemstate.hpp"
+
+namespace AMC {
+
+	enum class APIHandler_UIType {
+		utUnknown = 0,
+		utConfiguration = 1,
+	};
+
+	class CAPIHandler_UI : public CAPIHandler {
+	private:
+		
+		PSystemState m_pSystemState;
+
+		APIHandler_UIType parseRequest(const std::string& sURI, const eAPIRequestType requestType);
+
+		void handleConfigurationRequest(CJSONWriter& writer, PAPIAuth pAuth);
+
+	public:
+
+		CAPIHandler_UI(PSystemState pSystemState);
+
+		virtual ~CAPIHandler_UI();
+				
+		virtual std::string getBaseURI () override;
+
+		virtual PAPIResponse handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth) override;
+
+	};
+
+	
+}
+
+
+#endif //__AMC_API_HANDLER_UI
+
diff --git a/Implementation/API/amc_api_handler_upload.cpp b/Implementation/API/amc_api_handler_upload.cpp
new file mode 100644
index 00000000..fee5e954
--- /dev/null
+++ b/Implementation/API/amc_api_handler_upload.cpp
@@ -0,0 +1,273 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "amc_api_handler_upload.hpp"
+#include "amc_api_jsonrequest.hpp"
+
+#include "libmc_interfaceexception.hpp"
+#include "libmcdata_dynamic.hpp"
+
+#include "common_utils.hpp"
+
+#include <vector>
+#include <memory>
+#include <string>
+#include <iostream>
+
+
+using namespace AMC;
+
+CAPIHandler_Upload::CAPIHandler_Upload(PSystemState pSystemState)
+	: m_pSystemState(pSystemState)
+{
+	if (pSystemState.get() == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+	m_StreamUploadFields.push_back(CAPIFieldDetails(AMC_API_KEY_UPLOAD_DATASIZE, false, true));
+	m_StreamUploadFields.push_back(CAPIFieldDetails(AMC_API_KEY_UPLOAD_DATAOFFSET, false, false));
+	m_StreamUploadFields.push_back(CAPIFieldDetails(AMC_API_KEY_UPLOAD_DATA, true, true));
+}
+
+CAPIHandler_Upload::~CAPIHandler_Upload()
+{
+	
+}
+				
+std::string CAPIHandler_Upload::getBaseURI () 
+{
+	return "api/upload";
+}
+
+APIHandler_UploadType CAPIHandler_Upload::parseRequest(const std::string& sURI, const eAPIRequestType requestType, std::string& uploadUUID)
+{
+	// Leave away base URI
+	auto sParameterString = AMCCommon::CUtils::toLowerString (sURI.substr(10));
+	uploadUUID = "";
+
+	if (requestType == eAPIRequestType::rtPost) {
+		if ((sParameterString == "") || (sParameterString == "/")) {
+			return utInitUpload;
+		}
+		else {
+
+			if (sParameterString == "/finish") {
+				return utFinishUpload;
+			}
+
+			if ((sParameterString.substr(0,1) == "/") && (sParameterString.length() == 37)) {
+				uploadUUID = AMCCommon::CUtils::normalizeUUIDString(sParameterString.substr(1));
+				return utStreamUpload;
+			}
+		}
+	
+	}
+
+	return utUnknown;
+}
+
+
+bool CAPIHandler_Upload::expectsRawBody(const std::string& sURI, const eAPIRequestType requestType)
+{
+	std::string uploadUUID;
+
+	switch (parseRequest(sURI, requestType, uploadUUID)) {
+		case utInitUpload:
+		case utFinishUpload:
+			return true;
+
+		default:
+			return false;
+	}
+}
+
+
+uint32_t CAPIHandler_Upload::getFormDataFieldCount(const std::string& sURI, const eAPIRequestType requestType)
+{
+	std::string uploadUUID;
+	auto uploadType = parseRequest(sURI, requestType, uploadUUID);
+
+	switch (uploadType) {
+		case utStreamUpload: return (uint32_t) m_StreamUploadFields.size();
+		default: return 0;
+	}
+	
+}
+
+CAPIFieldDetails CAPIHandler_Upload::getFormDataFieldDetails(const std::string& sURI, const eAPIRequestType requestType, const uint32_t nFieldIndex)
+{
+	std::string uploadUUID;
+	auto uploadType = parseRequest(sURI, requestType, uploadUUID);
+
+	switch (uploadType) {
+	case utStreamUpload: 
+		if (nFieldIndex >= m_StreamUploadFields.size ())
+			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDINDEX);
+
+		return m_StreamUploadFields [nFieldIndex];
+
+	default: 
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDINDEX);
+	}
+
+	
+}
+
+
+void CAPIHandler_Upload::handleInitUploadRequest(CJSONWriter& writer, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth)
+{
+	if (pBodyData == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+	if (pAuth.get () == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+	auto sUUID = AMCCommon::CUtils::createUUID();
+
+	auto pStorage = m_pSystemState->storage();
+
+	CAPIJSONRequest jsonRequest(pBodyData, nBodyDataSize);
+
+	auto sContext = jsonRequest.getNameString(AMC_API_KEY_UPLOAD_CONTEXT, LIBMC_ERROR_INVALIDCONTEXTUUID);
+	auto sName = jsonRequest.getNameString(AMC_API_KEY_UPLOAD_NAME, LIBMC_ERROR_INVALIDUPLOADNAME);
+	auto sMimeType = jsonRequest.getNameString(AMC_API_KEY_UPLOAD_MIMETYPE, LIBMC_ERROR_INVALIDMIMETYPE);
+	auto nSize = jsonRequest.getSize(AMC_API_KEY_UPLOAD_SIZE, 1, pStorage->GetMaxStreamSize(), LIBMC_ERROR_INVALIDSTREAMSIZE);
+	auto sSHA256 = jsonRequest.getSHA256(AMC_API_KEY_UPLOAD_SHA256, LIBMC_ERROR_INVALIDSHA256SUM);
+
+	std::string sContextUUID;
+
+	if (sContext == "build") {
+		sContextUUID = createNewBuild (sName, sUUID, pAuth);
+	}
+	else {
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDCONTEXTUUID);
+	}
+		
+	if (!pStorage->ContentTypeIsAccepted(sMimeType))
+		throw ELibMCInterfaceException(LIBMC_ERROR_CONTENTTYPENOTACCEPTED);
+	
+	if (!pAuth->contextUUIDIsAuthorized(sContextUUID))
+		throw ELibMCInterfaceException(LIBMC_ERROR_CONTEXTUUIDNOTACCEPTED);
+
+	pStorage->BeginPartialStream (sUUID, sContextUUID, sName, sMimeType, nSize, sSHA256, pAuth->getUserName ());
+
+	writer.addString(AMC_API_KEY_UPLOAD_STREAMUUID, sUUID);
+	writer.addString(AMC_API_KEY_UPLOAD_CONTEXTUUID, sContextUUID);
+
+}
+
+void CAPIHandler_Upload::handleFinishUploadRequest(CJSONWriter& writer, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth)
+{
+	if (pBodyData == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+	if (pAuth.get() == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+	auto pStorage = m_pSystemState->storage();
+
+	CAPIJSONRequest jsonRequest(pBodyData, nBodyDataSize);
+
+	auto sUUID = jsonRequest.getUUID(AMC_API_KEY_UPLOAD_STREAMUUID, LIBMC_ERROR_INVALIDSTREAMUUID);
+	pStorage->FinishPartialStream(sUUID);
+
+
+}
+
+void CAPIHandler_Upload::handleStreamUploadRequest(CJSONWriter& writer, CAPIFormFields & pFormFields, const std::string& sStreamUUID, PAPIAuth pAuth)
+{
+	if (pAuth.get() == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+	
+	auto pData = pFormFields.getDataField(AMC_API_KEY_UPLOAD_DATA);
+	uint64_t nSize = pFormFields.getUint64Field(AMC_API_KEY_UPLOAD_DATASIZE);
+	uint64_t nOffset = 0;
+	if (pFormFields.hasStringField (AMC_API_KEY_UPLOAD_DATAOFFSET))
+		nOffset = pFormFields.getUint64Field(AMC_API_KEY_UPLOAD_DATAOFFSET);
+
+	if (nSize != (uint64_t)pData->size())
+		throw ELibMCInterfaceException(LIBMC_ERROR_UPLOADSIZEMISMATCH);
+
+	auto pStorage = m_pSystemState->storage();
+	pStorage->StorePartialStream(sStreamUUID, nOffset, *pData);
+
+}
+
+
+		
+PAPIResponse CAPIHandler_Upload::handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth)
+{
+
+
+	if (requestType == eAPIRequestType::rtPost) {
+
+		std::string sUploadUUID;
+		auto uploadType = parseRequest(sURI, requestType, sUploadUUID);
+
+		CJSONWriter writer;
+		writeJSONHeader(writer, AMC_API_PROTOCOL_UPLOAD);
+
+		switch (uploadType) {
+			case utInitUpload:
+				handleInitUploadRequest (writer, pBodyData, nBodyDataSize, pAuth);
+				break;
+
+			case utFinishUpload:
+				handleFinishUploadRequest(writer, pBodyData, nBodyDataSize, pAuth);
+				break;
+
+			case utStreamUpload:
+				handleStreamUploadRequest(writer, pFormFields, sUploadUUID, pAuth);
+				break;
+
+			default:
+				throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+		}
+
+		return std::make_shared<CAPIStringResponse>(AMC_API_HTTP_SUCCESS, AMC_API_CONTENTTYPE, writer.saveToString());
+	}
+
+
+	return nullptr;
+}
+
+
+std::string CAPIHandler_Upload::createNewBuild(const std::string& sName, const std::string& sStorageStreamUUID, PAPIAuth pAuth)
+{
+	if (pAuth.get() == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+	std::string sBuildUUID = AMCCommon::CUtils::createUUID();
+
+	auto pBuildJobHandler = m_pSystemState->buildJobHandler();
+	pBuildJobHandler->CreateJob(sBuildUUID, sName, pAuth->getUserName(), sStorageStreamUUID);
+
+	return sBuildUUID;
+}
+
+		
+
diff --git a/Implementation/API/amc_api_handler_upload.hpp b/Implementation/API/amc_api_handler_upload.hpp
new file mode 100644
index 00000000..d9a1c751
--- /dev/null
+++ b/Implementation/API/amc_api_handler_upload.hpp
@@ -0,0 +1,88 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_API_HANDLER_UPLOAD
+#define __AMC_API_HANDLER_UPLOAD
+
+#include "amc_api_handler.hpp"
+#include "amc_logger.hpp"
+#include "amc_api_response.hpp"
+
+#include "amc_systemstate.hpp"
+
+namespace AMC {
+
+	enum APIHandler_UploadType {
+		utUnknown = 0,
+		utInitUpload = 1,
+		utStreamUpload = 2,
+		utFinishUpload = 3
+	};
+
+	class CAPIHandler_Upload : public CAPIHandler {
+	private:
+		
+		PSystemState m_pSystemState;
+
+		std::vector <CAPIFieldDetails> m_StreamUploadFields;
+
+		APIHandler_UploadType parseRequest (const std::string& sURI, const eAPIRequestType requestType, std::string & uploadUUID);
+
+		void handleInitUploadRequest(CJSONWriter & writer, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth);
+		void handleFinishUploadRequest(CJSONWriter& writer, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth);
+		void handleStreamUploadRequest(CJSONWriter& writer, CAPIFormFields & pFormFields, const std::string & sStreamUUID, PAPIAuth pAuth);
+
+		std::string createNewBuild (const std::string & sName, const std::string & sStorageStreamUUID, PAPIAuth pAuth);
+
+	public:
+
+		CAPIHandler_Upload(PSystemState pSystemState);
+
+		virtual ~CAPIHandler_Upload();
+				
+		virtual std::string getBaseURI () override;
+
+		virtual PAPIResponse handleRequest(const std::string& sURI, const eAPIRequestType requestType, CAPIFormFields & pFormFields, const uint8_t* pBodyData, const size_t nBodyDataSize, PAPIAuth pAuth) override;
+
+		virtual uint32_t getFormDataFieldCount(const std::string& sURI, const eAPIRequestType requestType) override;
+
+		virtual CAPIFieldDetails getFormDataFieldDetails(const std::string& sURI, const eAPIRequestType requestType, const uint32_t nFieldIndex) override;
+
+		virtual bool expectsRawBody(const std::string& sURI, const eAPIRequestType requestType) override;
+
+	};
+
+	
+}
+
+
+#endif //__AMC_API_HANDLER_UPLOAD
+
diff --git a/Implementation/API/amc_api_jsonrequest.cpp b/Implementation/API/amc_api_jsonrequest.cpp
new file mode 100644
index 00000000..88515e92
--- /dev/null
+++ b/Implementation/API/amc_api_jsonrequest.cpp
@@ -0,0 +1,131 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "amc_api_jsonrequest.hpp"
+#include "libmc_interfaceexception.hpp"
+
+#include "RapidJSON/document.h"
+#include "Common/common_utils.hpp"
+
+using namespace AMC;
+
+class AMC::CAPIJSONImpl
+{
+public:
+	rapidjson::Document m_Document;
+
+};
+
+
+CAPIJSONRequest::CAPIJSONRequest(const uint8_t* pBodyData, const size_t nBodySize)
+	: m_pImpl (__construct (pBodyData, nBodySize))
+{
+}
+
+CAPIJSONRequest::~CAPIJSONRequest()
+{
+
+}
+
+CAPIJSONImpl* CAPIJSONRequest::__construct(const uint8_t* pBodyData, const size_t nBodySize)
+{
+	if (pBodyData == nullptr)
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+	auto pImpl = std::make_unique <CAPIJSONImpl>();
+	pImpl->m_Document.Parse((const char*)pBodyData, nBodySize);	
+	if (pImpl->m_Document.HasParseError ()) 
+		throw ELibMCInterfaceException(LIBMC_ERROR_COULDNOTPARSEJSONREQUEST);
+
+	return pImpl.release();
+}
+
+
+bool CAPIJSONRequest::hasValue(const std::string& sKeyName)
+{
+	return m_pImpl->m_Document.HasMember(sKeyName.c_str ());
+}
+
+std::string CAPIJSONRequest::getRawString(const std::string& sKeyName, uint32_t nErrorCode)
+{
+	
+	if (!hasValue (sKeyName))
+		throw ELibMCInterfaceException(nErrorCode);
+	if (!m_pImpl->m_Document[sKeyName.c_str()].IsString())
+		throw ELibMCInterfaceException(nErrorCode);
+
+	return m_pImpl->m_Document[sKeyName.c_str()].GetString ();
+}
+
+std::string CAPIJSONRequest::getUUID(const std::string& sKeyName, uint32_t nErrorCode)
+{
+	auto sRawString = getRawString(sKeyName, nErrorCode);
+	return AMCCommon::CUtils::normalizeUUIDString(sRawString);
+}
+
+std::string CAPIJSONRequest::getNameString(const std::string& sKeyName, uint32_t nErrorCode)
+{
+	auto sRawString = getRawString(sKeyName, nErrorCode);
+
+	if (!AMCCommon::CUtils::UTF8StringIsValid(sRawString))
+		throw ELibMCInterfaceException(nErrorCode);
+
+	for (char& c : sRawString) {
+		if (c < 32)
+			throw ELibMCInterfaceException(nErrorCode);
+	}
+
+	return AMCCommon::CUtils::trimString (sRawString);
+}
+
+
+uint64_t CAPIJSONRequest::getSize(const std::string& sKeyName, const uint64_t nMinSize, const uint64_t nMaxSize, uint32_t nErrorCode)
+{
+	if (!hasValue(sKeyName))
+		throw ELibMCInterfaceException(nErrorCode);
+	if (!m_pImpl->m_Document[sKeyName.c_str()].IsUint64())
+		throw ELibMCInterfaceException(nErrorCode);
+
+	uint64_t nValue = m_pImpl->m_Document[sKeyName.c_str()].GetUint64();
+
+	if ((nValue < nMinSize) || (nValue > nMaxSize))
+		throw ELibMCInterfaceException(nErrorCode);
+
+	return nValue;
+}
+
+std::string CAPIJSONRequest::getSHA256(const std::string& sKeyName, uint32_t nErrorCode)
+{
+	auto sNameString = getNameString(sKeyName, nErrorCode);
+
+	return AMCCommon::CUtils::normalizeSHA256String(sNameString);
+
+
+}
diff --git a/Implementation/API/amc_api_jsonrequest.hpp b/Implementation/API/amc_api_jsonrequest.hpp
new file mode 100644
index 00000000..e2965610
--- /dev/null
+++ b/Implementation/API/amc_api_jsonrequest.hpp
@@ -0,0 +1,72 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_API_JSONREQUEST
+#define __AMC_API_JSONREQUEST
+
+#include <memory>
+#include <string>
+#include <map>
+
+namespace AMC {
+
+	class CAPIJSONRequest;
+	typedef std::shared_ptr<CAPIJSONRequest> PAPIJSONRequest;
+	
+	class CAPIJSONImpl;
+
+	class CAPIJSONRequest {
+	private:
+
+		std::unique_ptr<CAPIJSONImpl> m_pImpl;
+		static CAPIJSONImpl* __construct(const uint8_t* pBodyData, const size_t nBodySize);
+			
+	public:
+
+		CAPIJSONRequest (const uint8_t * pBodyData, const size_t nBodySize);
+
+		virtual ~CAPIJSONRequest();
+							
+		bool hasValue(const std::string& sKeyName);
+		std::string getRawString(const std::string& sKeyName, uint32_t nErrorCode);
+
+		std::string getUUID (const std::string & sKeyName, uint32_t nErrorCode);
+		std::string getNameString(const std::string& sKeyName, uint32_t nErrorCode);
+		uint64_t getSize(const std::string& sKeyName, const uint64_t nMinSize, const uint64_t nMaxSize, uint32_t nErrorCode);
+		std::string getSHA256(const std::string& sKeyName, uint32_t nErrorCode);
+	};
+
+	
+}
+
+
+#endif //__AMC_API_JSONREQUEST
+
diff --git a/Implementation/API/amc_api_response.cpp b/Implementation/API/amc_api_response.cpp
index 8eb09521..b9b23496 100644
--- a/Implementation/API/amc_api_response.cpp
+++ b/Implementation/API/amc_api_response.cpp
@@ -28,15 +28,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
+#define __AMCIMPL_API_CONSTANTS
 
 #include "amc_api_response.hpp"
+#include "amc_api_constants.hpp"
 #include "libmc_interfaceexception.hpp"
 
 using namespace AMC;
 
 
-CAPIResponse::CAPIResponse(const std::string& sContentType)
-	: m_sContentType (sContentType)
+CAPIResponse::CAPIResponse(uint32_t nHTTPCode, const std::string& sContentType)
+	: m_sContentType (sContentType), m_nHTTPCode (nHTTPCode)
 {
 
 }
@@ -59,10 +61,16 @@ std::string CAPIResponse::getContentType() const
 	return m_sContentType;
 }
 
+uint32_t CAPIResponse::getHTTPCode() const
+{
+	return m_nHTTPCode;
+}
+
+
 
 
-CAPIStringResponse::CAPIStringResponse(const std::string& sContentType, const std::string& sStringValue)
-	: CAPIResponse (sContentType)
+CAPIStringResponse::CAPIStringResponse(uint32_t nHTTPCode, const std::string& sContentType, const std::string& sStringValue)
+	: CAPIResponse (nHTTPCode, sContentType)
 {
 	size_t len = sStringValue.length();
 	if (len > 0) {
@@ -82,7 +90,7 @@ CAPIStringResponse::CAPIStringResponse(const std::string& sContentType, const st
 
 
 CAPIFixedBufferResponse::CAPIFixedBufferResponse(const std::string& sContentType)
-	: CAPIResponse (sContentType)
+	: CAPIResponse (AMC_API_HTTP_SUCCESS, sContentType)
 {
 }
 
diff --git a/Implementation/API/amc_api_response.hpp b/Implementation/API/amc_api_response.hpp
index 03a3f4c7..ad650192 100644
--- a/Implementation/API/amc_api_response.hpp
+++ b/Implementation/API/amc_api_response.hpp
@@ -32,25 +32,26 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_API_RESPONSE
 #define __AMC_API_RESPONSE
 
-#include <vector>
-#include <memory>
-#include <string>
+#include "header_protection.hpp"
 
+#include "amc_api_types.hpp"
 
+#include <vector>
 
 namespace AMC {
 
-
 	class CAPIResponse {
 	protected:
 
 		std::vector<uint8_t> m_StreamData;
 
 		std::string m_sContentType;
+
+		uint32_t m_nHTTPCode;
 			
 	public:
 
-		CAPIResponse (const std::string & sContentType);
+		CAPIResponse (uint32_t nHTTPCode, const std::string & sContentType);
 		
 		size_t getStreamSize () const;
 		
@@ -58,6 +59,8 @@ namespace AMC {
 		
 		std::string getContentType () const;
 
+		uint32_t getHTTPCode() const;
+
 	};
 
 
@@ -66,7 +69,7 @@ namespace AMC {
 			
 	public:
 
-		CAPIStringResponse(const std::string & sContentType, const std::string & sStringValue);
+		CAPIStringResponse(uint32_t nHTTPCode, const std::string & sContentType, const std::string & sStringValue);
 
 	};
 
diff --git a/Implementation/API/amc_api_types.hpp b/Implementation/API/amc_api_types.hpp
new file mode 100644
index 00000000..831c37a4
--- /dev/null
+++ b/Implementation/API/amc_api_types.hpp
@@ -0,0 +1,50 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_API_TYPES
+#define __AMC_API_TYPES
+
+
+namespace AMC {
+
+	enum class eAPIRequestType : uint32_t {
+		rtUnknown = 0,
+		rtGet = 1,
+		rtPost = 2
+	};
+
+
+	
+}
+
+
+#endif //__AMC_API_TYPES
+
diff --git a/Implementation/Common/common_exportstream.hpp b/Implementation/Common/common_exportstream.hpp
index 4090f584..d1611484 100644
--- a/Implementation/Common/common_exportstream.hpp
+++ b/Implementation/Common/common_exportstream.hpp
@@ -46,6 +46,8 @@ namespace AMCCommon {
 		virtual bool seekFromEnd(uint64_t bytes, bool bHasToSucceed) = 0;
 		virtual uint64_t getPosition () = 0;
 		virtual uint64_t writeBuffer(const void * pBuffer, uint64_t cbTotalBytesToWrite) = 0;
+
+		virtual void writeZeros(uint64_t bytes) = 0;
 	};
 
 	typedef std::shared_ptr <CExportStream> PExportStream;
diff --git a/Implementation/Common/common_exportstream_native.cpp b/Implementation/Common/common_exportstream_native.cpp
index c4540197..a7e4ab44 100644
--- a/Implementation/Common/common_exportstream_native.cpp
+++ b/Implementation/Common/common_exportstream_native.cpp
@@ -34,6 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "common_utils.hpp"
 
 #include <string>
+#include <vector>
 
 namespace AMCCommon {
 
@@ -127,5 +128,31 @@ namespace AMCCommon {
         return nSize;
 	}
 
+
+	void CExportStream_Native::writeZeros(uint64_t bytes)
+	{
+
+		if (bytes > 0) {
+			uint32_t bufferSize = 1024 * 1024;
+			std::vector <uint64_t> Buffer;
+			Buffer.resize(bufferSize / sizeof(uint64_t));
+
+			for (auto iter = Buffer.begin(); iter != Buffer.end(); iter++)
+				*iter = 0;
+
+			while (bytes > 0) {
+				auto bytesToWrite = bytes;
+				if (bytes > bufferSize)
+					bytes = bufferSize;
+
+				writeBuffer(Buffer.data(), bytesToWrite);
+				bytes -= bytesToWrite;
+
+			}
+		}
+
+	}
+
+		
 }
 
diff --git a/Implementation/Common/common_exportstream_native.hpp b/Implementation/Common/common_exportstream_native.hpp
index feb26395..29d41c94 100644
--- a/Implementation/Common/common_exportstream_native.hpp
+++ b/Implementation/Common/common_exportstream_native.hpp
@@ -51,6 +51,8 @@ namespace AMCCommon {
 		bool seekFromEnd(uint64_t bytes, bool bHasToSucceed) override;
 		uint64_t getPosition() override;
 		uint64_t writeBuffer(const void* pBuffer, uint64_t cbTotalBytesToWrite) override;
+
+		void writeZeros(uint64_t bytes) override;
 	};
 
 }
diff --git a/Implementation/Common/common_utils.cpp b/Implementation/Common/common_utils.cpp
index cd8c3edb..378805e1 100644
--- a/Implementation/Common/common_utils.cpp
+++ b/Implementation/Common/common_utils.cpp
@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <thread>
 
 #include "crossguid/guid.hpp"
+#include "PicoSHA2/picosha2.h"
 
 #ifdef _WIN32
 #include <objbase.h>
@@ -276,6 +277,97 @@ namespace AMCCommon {
 		nLowSurrogate = (nCharacterID & 0x3ff) | 0xdc00;
 	}
 
+	bool CUtils::UTF8StringIsValid(const std::string& sString)
+	{
+		const char* pChar = sString.c_str();
+
+		while (*pChar) {
+			unsigned char cChar = (unsigned char)*pChar;
+			uint32_t nLength = UTF8DecodeTable[(uint32_t)cChar];
+			pChar++;
+
+			if (nLength == 0)
+				return false;
+			if (nLength > 6)
+				return false;
+
+			// Check for BOM (0xEF,0xBB,0xBF), this also checks for #0 characters at the end,
+			// so it does not read over the string end!
+			bool bIsBOM = false;
+			if (cChar == 0xef) {
+				if (*((const unsigned char*)pChar) == 0xbb) {
+					if (*((const unsigned char*)(pChar + 1)) == 0xbf) {
+						bIsBOM = true;
+					}
+				}
+			};
+
+
+			if (!bIsBOM) {
+				uint32_t nCode = cChar & UTF8DecodeMask[nLength];
+
+				while (nLength > 1) {
+					cChar = *pChar;
+					if ((cChar & 0xc0) != 0x80)
+						return false;
+					pChar++;
+
+					// Map UTF8 sequence to code
+					nCode = (nCode << 6) | (cChar & 0x3f);
+					nLength--;
+				}
+
+				// Map Code to UTF16
+				if ((nCode < 0xd800) || ((nCode >= 0xe000) && (nCode <= 0xffff))) {
+					// everything is good in this case
+
+				}
+				else {
+					if ((nCode < 0x10000) || (nCode > 0x10FFFF))
+						return false;
+
+					// everything is good in this case
+				}
+			}
+			else {
+				// If we find a UTF8 bom, we just ignore it.
+				if (nLength != 3)
+					return false;
+				pChar += 2;
+			}
+		}
+
+
+		// success
+		return true;
+	}
+
+	
+	std::string CUtils::trimString(const std::string& sString)
+	{
+		std::string s = sString;
+		// left trim
+		s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](int ch) {
+			return !std::isspace(ch);
+		}));
+
+		// right trim
+		s.erase(std::find_if(s.rbegin(), s.rend(), [](int ch) {
+			return !std::isspace(ch);
+		}).base(), s.end());
+
+		return s;
+	}
+
+	std::string CUtils::toLowerString(const std::string& sString)
+	{
+		std::string s = sString;
+		std::transform(s.begin(), s.end(), s.begin(),
+			[](unsigned char c) { return std::tolower(c); } // correct
+		);
+		return s;
+	}
+
 
     std::wstring CUtils::UTF8toUTF16(const std::string sString)
 	{
@@ -382,10 +474,24 @@ namespace AMCCommon {
 	}
 
 
+	std::string CUtils::normalizeSHA256String(std::string sRawString)
+	{
+		// to lowercase, remove all non hex characters, insert dashes again
+		std::transform(sRawString.begin(), sRawString.end(), sRawString.begin(), ::tolower);
+		sRawString.erase(std::remove_if(sRawString.begin(), sRawString.end(), &UUIDInValid), sRawString.end());
+		if (sRawString.length() != 64) {
+			throw std::runtime_error("invalid sha256 string " + sRawString);
+		}
+
+		return sRawString;
+	}
+
+
+
 	std::string CUtils::createUUID()
 	{
-		xg::Guid guid;
-		return guid.str();
+		auto guid = xg::newGuid ();		
+		return normalizeUUIDString (guid.str());
 	}
 
 	void CUtils::sleepMilliseconds(const uint32_t milliSeconds)
@@ -415,12 +521,34 @@ namespace AMCCommon {
 				throw std::runtime_error("could not delete file: " + sFileName);		
 		}
 #else
-		if (std::remove(sFileName)) {
+		if (std::remove(sFileName.c_str())) {
 			throw std::runtime_error("could not delete file: " + sFileName);
 		}
 #endif
 	}
 
 
+	std::string CUtils::calculateSHA256FromFile(const std::string& sFileNameUTF8)
+	{
+		std::vector<unsigned char> hash(picosha2::k_digest_size);
+
+#ifdef _WIN32
+		auto sWidePath = AMCCommon::CUtils::UTF8toUTF16(sFileNameUTF8);
+		std::ifstream shaStream(sWidePath, std::ios::binary);
+#else
+		std::ifstream shaStream(sFileNameUTF8, std::ios::binary);
+#endif			
+
+		picosha2::hash256(shaStream, hash.begin(), hash.end());
+		return picosha2::bytes_to_hex_string(hash.begin(), hash.end());
+	}
+
+	std::string CUtils::calculateSHA256FromString(const std::string& sString)
+	{
+		std::vector<unsigned char> hash(picosha2::k_digest_size);
+		picosha2::hash256(sString.begin(), sString.end(), hash.begin(), hash.end());
+		return picosha2::bytes_to_hex_string(hash.begin(), hash.end());
+	}
+
 
 }
diff --git a/Implementation/Common/common_utils.hpp b/Implementation/Common/common_utils.hpp
index a392d351..149184e3 100644
--- a/Implementation/Common/common_utils.hpp
+++ b/Implementation/Common/common_utils.hpp
@@ -50,9 +50,16 @@ namespace AMCCommon {
 		static std::string getCurrentTimeFileName();
 		static std::string createUUID();
 		static std::string normalizeUUIDString(std::string sRawString);
+		static std::string normalizeSHA256String(std::string sRawString);		
 		
 		static std::string UTF16toUTF8(std::wstring sString);
 		static std::wstring UTF8toUTF16(std::string sString);
+		static bool UTF8StringIsValid (const std::string & sString);
+		static std::string trimString (const std::string& sString);
+		static std::string toLowerString(const std::string& sString);
+
+		static std::string calculateSHA256FromFile(const std::string& sFileNameUTF8);
+		static std::string calculateSHA256FromString(const std::string& sString);
 
 		static void sleepMilliseconds(const uint32_t milliSeconds);
 		static void deleteFileFromDisk(const std::string & sFileName, bool MustSucceed);
diff --git a/Implementation/Common/header_protection.hpp b/Implementation/Common/header_protection.hpp
new file mode 100644
index 00000000..0420892f
--- /dev/null
+++ b/Implementation/Common/header_protection.hpp
@@ -0,0 +1,44 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_HEADER_PROTECTION
+#define __AMC_HEADER_PROTECTION
+
+#include <memory>
+#include <string>
+#include <list>
+#include <map>
+
+// Macros for forward declaration of classes
+#define amcDeclareDependingClass(CLASSNAME, SHAREDPTRNAME) class CLASSNAME; typedef std::shared_ptr<CLASSNAME> SHAREDPTRNAME;
+
+#endif //__AMC_HEADER_PROTECTION
+
diff --git a/Implementation/Common/header_pugixml.hpp b/Implementation/Common/header_pugixml.hpp
new file mode 100644
index 00000000..1fe508f7
--- /dev/null
+++ b/Implementation/Common/header_pugixml.hpp
@@ -0,0 +1,44 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_HEADER_PUGIXML
+#define __AMC_HEADER_PUGIXML
+
+// Forward declarations of external headers
+
+namespace pugi {
+
+	class xml_node;
+
+}
+
+#endif //__AMC_HEADER_PUGIXML
+
diff --git a/Implementation/Core/amc_service.cpp b/Implementation/Core/amc_service.cpp
new file mode 100644
index 00000000..d3f894e9
--- /dev/null
+++ b/Implementation/Core/amc_service.cpp
@@ -0,0 +1,120 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#include "amc_service.hpp"
+#include "amc_servicehandler.hpp"
+
+#include "common_utils.hpp"
+#include "libmc_interfaceexception.hpp"
+
+
+
+namespace AMC {
+	
+	CService::CService(CServiceHandler* pServiceHandler)
+		: m_pServiceHandler (pServiceHandler), m_bHasBeenExecuted (false), m_bIsRunning (false)
+	{
+		if (pServiceHandler == nullptr)
+			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+	}
+
+	CService::~CService()
+	{
+	}
+
+
+	void serviceRunners(CService* pService)
+	{
+		if (pService)
+			pService->executeThreadedEx();
+	}
+
+	void CService::executeThreaded()
+	{
+		setIsRunning(true);
+
+
+		executeThreadedEx();
+
+		//std::thread Thread (serviceRunners, this);
+	}
+
+	void CService::executeThreadedEx()
+	{
+		try {
+			executeBlocking();
+
+			setIsRunning(false);
+
+		}
+		catch (std::exception & E) {
+			setIsRunning(false);
+			m_pServiceHandler->logMessage(E.what(), LOG_SUBSYSTEM_SYSTEM, AMC::eLogLevel::FatalError);
+		}
+
+		m_pServiceHandler->handleQueue();
+	}
+
+	void CService::setHasBeenExecuted(bool bValue)
+	{
+		std::lock_guard<std::mutex> lockGuard(m_Mutex);
+		m_bHasBeenExecuted = bValue;
+	}
+
+	void CService::setIsRunning(bool bValue)
+	{
+		std::lock_guard<std::mutex> lockGuard(m_Mutex);
+		m_bIsRunning = bValue;
+	}
+
+	bool CService::getHasBeenExecuted()
+	{
+		std::lock_guard<std::mutex> lockGuard(m_Mutex);
+		return m_bHasBeenExecuted;
+	}
+
+	bool CService::getIsRunning()
+	{
+		std::lock_guard<std::mutex> lockGuard(m_Mutex);
+		return m_bIsRunning;
+	}
+
+	CServiceHandler* CService::getServiceHandler()
+	{
+		return m_pServiceHandler;
+	}
+
+
+
+}
+
+
diff --git a/Implementation/Core/amc_service.hpp b/Implementation/Core/amc_service.hpp
new file mode 100644
index 00000000..3e2c45ab
--- /dev/null
+++ b/Implementation/Core/amc_service.hpp
@@ -0,0 +1,88 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_SERVICE
+#define __AMC_SERVICE
+
+#include <memory>
+#include <string>
+#include <map>
+#include <list>
+#include <thread>
+#include <mutex>
+
+namespace AMC {
+
+	class CServiceHandler;
+	typedef std::shared_ptr<CServiceHandler> PServiceHandler;
+
+	class CService;
+	typedef std::shared_ptr<CService> PService;
+
+
+	class CService {
+	private:
+		bool m_bHasBeenExecuted;
+		bool m_bIsRunning;
+		std::mutex m_Mutex;
+
+		void setHasBeenExecuted(bool bValue);
+		void setIsRunning(bool bValue);
+		
+	protected:
+		CServiceHandler * m_pServiceHandler;
+
+	public:
+
+		CService (CServiceHandler* pServiceHandler);
+		virtual ~CService();
+
+		void executeThreaded();
+
+		bool getHasBeenExecuted();
+		bool getIsRunning();
+
+		CServiceHandler* getServiceHandler ();
+
+		void executeThreadedEx();
+
+		virtual void executeBlocking() = 0;
+
+		virtual std::string getName() = 0;
+
+	};
+
+	
+}
+
+
+#endif //__AMC_SERVICE
+
diff --git a/Implementation/Core/amc_service_buildfileparsing.cpp b/Implementation/Core/amc_service_buildfileparsing.cpp
new file mode 100644
index 00000000..d7da53b3
--- /dev/null
+++ b/Implementation/Core/amc_service_buildfileparsing.cpp
@@ -0,0 +1,84 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#include "amc_service_buildfileparsing.hpp"
+#include "amc_servicehandler.hpp"
+
+#include "common_utils.hpp"
+#include "libmc_interfaceexception.hpp"
+
+#include "amc_systemstate.hpp"
+#include "amc_toolpathentity.hpp"
+
+
+namespace AMC {
+	
+	
+	CService_BuildFileParsing::CService_BuildFileParsing(CServiceHandler* pServiceHandler, LibMCData::PBuildJob pBuildJob, Lib3MF::PWrapper p3MFWrapper, const std::string& sUserID)
+		: CService (pServiceHandler), m_pBuildJob (pBuildJob), m_p3MFWrapper (p3MFWrapper), m_sUserID (sUserID)
+	{
+		if (pBuildJob.get() == nullptr)
+			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+		if (p3MFWrapper.get() == nullptr)
+			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+	}
+	
+	
+	CService_BuildFileParsing::~CService_BuildFileParsing()
+	{
+		
+	}
+
+	
+	void CService_BuildFileParsing::executeBlocking()
+	{
+		
+		auto pStorageStream = m_pBuildJob->GetStorageStream();
+		
+		// TODO: Check Toolpath Entity Integrity
+		CToolpathEntity toolpathEntity (pStorageStream, m_p3MFWrapper);		
+		m_pBuildJob->FinishValidating (toolpathEntity.getLayerCount ());
+		m_pBuildJob->AddJobData(pStorageStream->GetName(), pStorageStream, LibMCData::eBuildJobDataType::Toolpath, m_sUserID);
+		
+
+	}
+		
+
+	std::string CService_BuildFileParsing::getName()
+	{
+		return "build file parsing";
+	}
+	
+
+}
+
+
diff --git a/Implementation/Core/amc_service_buildfileparsing.hpp b/Implementation/Core/amc_service_buildfileparsing.hpp
new file mode 100644
index 00000000..c872616f
--- /dev/null
+++ b/Implementation/Core/amc_service_buildfileparsing.hpp
@@ -0,0 +1,69 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_SERVICE_BUILDFILEPARSING
+#define __AMC_SERVICE_BUILDFILEPARSING
+
+#include "amc_servicehandler.hpp"
+#include "amc_service.hpp"
+
+#include "libmcdata_dynamic.hpp"
+#include "lib3mf/lib3mf_dynamic.hpp"
+
+#include <memory>
+
+namespace AMC {
+
+
+	class CService_BuildFileParsing : public CService {
+	private:
+		LibMCData::PBuildJob m_pBuildJob;
+		Lib3MF::PWrapper m_p3MFWrapper;
+		Lib3MF::PModel m_p3MFModel;
+		std::string m_sUserID;
+
+	protected:
+	public:
+
+		CService_BuildFileParsing(CServiceHandler* pServiceHandler, LibMCData::PBuildJob pBuildJob, Lib3MF::PWrapper p3MFWrapper, const std::string & sUserID);
+		virtual ~CService_BuildFileParsing();
+
+		virtual void executeBlocking() override;
+
+		virtual std::string getName() override;
+	};
+
+	
+}
+
+
+#endif //__AMC_SERVICE_BUILDFILEPARSING
+
diff --git a/Implementation/Core/amc_servicehandler.cpp b/Implementation/Core/amc_servicehandler.cpp
new file mode 100644
index 00000000..9917994f
--- /dev/null
+++ b/Implementation/Core/amc_servicehandler.cpp
@@ -0,0 +1,136 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#include "amc_servicehandler.hpp"
+#include "common_utils.hpp"
+#include "libmc_interfaceexception.hpp"
+
+
+namespace AMC {
+	
+
+	CServiceHandler::CServiceHandler(PLogger pLogger)
+		:  m_nMaxThreadCount(SERVICETHREADCOUNT_DEFAULT), m_pLogger (pLogger)
+	{
+		if (pLogger == nullptr)
+			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+	}
+
+	CServiceHandler::~CServiceHandler()
+	{
+
+	}
+
+	void CServiceHandler::addServiceToQueue(PService pService)
+	{
+		if (pService.get() == nullptr)
+			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+		if (pService->getServiceHandler() != this)
+			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+		{
+			// lock guard only for the push
+			std::lock_guard<std::mutex> lockGuard(m_Mutex);
+			m_QueuedServices.push(pService);			
+		}
+
+		handleQueue();
+		clearGarbage();
+	}
+
+	void CServiceHandler::handleQueue()
+	{
+		{
+			std::lock_guard<std::mutex> lockGuard(m_Mutex);
+
+			for (auto iter = m_RunningServices.begin(); iter != m_RunningServices.end();)
+			{
+				auto pService = (*iter);
+
+				if (!pService->getIsRunning())
+				{
+					// Store service in Garbage collector, as *iter might call handleQueue.
+					iter = m_RunningServices.erase(iter);
+					m_FinishedServices.insert(pService);
+				}
+				else
+				{
+					iter++;
+				}
+			}
+		}
+
+		// Start new services
+		while ((m_RunningServices.size() < (size_t)m_nMaxThreadCount) && (!m_QueuedServices.empty ())) {
+
+			PService pService; 
+
+			{
+				std::lock_guard<std::mutex> lockGuard(m_Mutex);
+
+				pService = m_QueuedServices.front();
+				m_QueuedServices.pop();
+				m_RunningServices.insert(pService);
+			}
+
+			logMessage("Executing service " + pService->getName(), LOG_SUBSYSTEM_SYSTEM, AMC::eLogLevel::Message);
+			pService->executeThreaded();
+		}
+
+
+	}
+
+
+	void CServiceHandler::logMessage(const std::string& sMessage, const std::string& sSubSystem, const eLogLevel logLevel)
+	{
+		m_pLogger->logMessage(sMessage, sSubSystem, logLevel);
+	}
+
+	void CServiceHandler::setMaxThreadCount(uint32_t nMaxThreadCount)
+	{
+		std::lock_guard<std::mutex> lockGuard(m_Mutex);
+
+		if (nMaxThreadCount == 0)
+			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+		m_nMaxThreadCount = nMaxThreadCount;
+	}
+
+	void CServiceHandler::clearGarbage()
+	{
+		std::lock_guard<std::mutex> lockGuard(m_Mutex);
+		m_FinishedServices.clear();
+	}
+
+
+}
+
+
diff --git a/Implementation/Core/amc_servicehandler.hpp b/Implementation/Core/amc_servicehandler.hpp
new file mode 100644
index 00000000..dd17d7f5
--- /dev/null
+++ b/Implementation/Core/amc_servicehandler.hpp
@@ -0,0 +1,88 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_SERVICEHANDLER
+#define __AMC_SERVICEHANDLER
+
+#include "amc_service.hpp"
+#include "amc_logger.hpp"
+
+#include <memory>
+#include <string>
+#include <set>
+#include <queue>
+
+#define SERVICETHREADCOUNT_MIN 2
+#define SERVICETHREADCOUNT_MAX 128
+#define SERVICETHREADCOUNT_DEFAULT 8
+
+namespace AMC {
+
+	class CServiceHandler;
+	typedef std::shared_ptr<CServiceHandler> PServiceHandler;
+
+	class CService;
+	typedef std::shared_ptr<CService> PService;
+
+	class CServiceHandler {
+	private:
+
+		uint32_t m_nMaxThreadCount;
+		std::mutex m_Mutex;
+		std::queue<PService> m_QueuedServices;
+		std::set<PService> m_RunningServices;
+		std::set<PService> m_FinishedServices;
+
+		PLogger m_pLogger;
+
+
+	public:
+
+		CServiceHandler(PLogger pLogger);
+		virtual ~CServiceHandler();
+
+		void addServiceToQueue (PService pService);
+
+		void handleQueue();
+
+		void clearGarbage();
+
+		void logMessage(const std::string& sMessage, const std::string& sSubSystem, const eLogLevel logLevel);
+
+		void setMaxThreadCount(uint32_t nMaxThreadCount);
+
+	};
+
+}
+
+
+#endif //__AMC_SERVICEHANDLER
+
diff --git a/Implementation/Core/amc_statemachineinstance.cpp b/Implementation/Core/amc_statemachineinstance.cpp
index a033eb46..33f59430 100644
--- a/Implementation/Core/amc_statemachineinstance.cpp
+++ b/Implementation/Core/amc_statemachineinstance.cpp
@@ -204,7 +204,7 @@ namespace AMC {
 
 			if (sNextState.empty())
 				throw ELibMCInterfaceException(LIBMC_ERROR_NOOUTSTATEGIVEN);
-			if (!m_pCurrentState->hasOutState(sNextState))
+			if (!m_pCurrentState->hasOutState(sNextState) && (sNextState != m_pFailedState->getName()))
 				throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDOUTSTATEGIVEN);
 
 			// Set new current state		
diff --git a/Implementation/Core/amc_statemachinestate.cpp b/Implementation/Core/amc_statemachinestate.cpp
index 5e0f902e..318333e8 100644
--- a/Implementation/Core/amc_statemachinestate.cpp
+++ b/Implementation/Core/amc_statemachinestate.cpp
@@ -30,6 +30,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 #include "amc_statemachinestate.hpp"
+#include "amc_driverhandler.hpp"
+
+#include "common_utils.hpp"
+
 #include "libmc_interfaceexception.hpp"
 
 #include "libmcenv_stateenvironment.hpp"
diff --git a/Implementation/Core/amc_statemachinestate.hpp b/Implementation/Core/amc_statemachinestate.hpp
index 003b8d13..301cd546 100644
--- a/Implementation/Core/amc_statemachinestate.hpp
+++ b/Implementation/Core/amc_statemachinestate.hpp
@@ -41,6 +41,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "libmcplugin_dynamic.hpp"
 #include "libmcenv_stateenvironment.hpp"
 
+#include "amc_parameterhandler.hpp"
+
 #define AMC_MINREPEATDELAY_MS 1 // 1 milliseconds minimum repeat delay
 #define AMC_MAXREPEATDELAY_MS 10000 // 10000 milliseconds maximum repeat delay
 #define AMC_REPEATDELAYCHUNK_MS 10 // 10 milliseconds sleep if waiting for repeat
diff --git a/Implementation/Core/amc_systemstate.cpp b/Implementation/Core/amc_systemstate.cpp
index 06a29d1e..70c0387a 100644
--- a/Implementation/Core/amc_systemstate.cpp
+++ b/Implementation/Core/amc_systemstate.cpp
@@ -32,6 +32,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "amc_systemstate.hpp"
 #include "libmc_interfaceexception.hpp"
 
+#include "amc_logger.hpp"
+#include "amc_parameterhandler.hpp"
+#include "amc_statesignalhandler.hpp"
+#include "amc_driverhandler.hpp"
+#include "amc_toolpathhandler.hpp"
+#include "amc_servicehandler.hpp"
+#include "amc_ui_handler.hpp"
+
+#include "libmcdata_dynamic.hpp"
+
 namespace AMC {
 
 	CSystemState::CSystemState(AMC::PLogger pLogger, LibMCData::PDataModel pDataModel, LibMCDriverEnv::PWrapper pDriverEnvWrapper)
@@ -53,6 +63,8 @@ namespace AMC {
 		m_pDriverHandler = std::make_shared<CDriverHandler>(pDriverEnvWrapper);
 		m_pSignalHandler = std::make_shared<CStateSignalHandler>();
 		m_pToolpathHandler = std::make_shared<CToolpathHandler>(m_pStorage, m_pBuildJobHandler);
+		m_pServiceHandler = std::make_shared<CServiceHandler>(m_pLogger);
+		m_pUIHandler = std::make_shared<CUIHandler>();
 	}
 
 	CSystemState::~CSystemState()
@@ -80,6 +92,17 @@ namespace AMC {
 		return m_pToolpathHandler.get();
 	}
 
+	CServiceHandler* CSystemState::serviceHandler()
+	{
+		return m_pServiceHandler.get();
+	}
+
+	CUIHandler* CSystemState::uiHandler()
+	{
+		return m_pUIHandler.get();
+	}
+
+
 	PLogger CSystemState::getLoggerInstance()
 	{
 		return m_pLogger;
@@ -100,6 +123,16 @@ namespace AMC {
 		return m_pToolpathHandler;
 	}
 
+	LibMCData::CStorage * CSystemState::storage()
+	{
+		return m_pStorage.get();
+	}
+
+	LibMCData::CBuildJobHandler* CSystemState::buildJobHandler()
+	{
+		return m_pBuildJobHandler.get();
+	}
+
 
 	void CSystemState::addLibraryPath(const std::string& sLibraryName, const std::string& sLibraryPath)
 	{
@@ -116,5 +149,10 @@ namespace AMC {
 		return iIter->second;
 	}
 
+	std::string CSystemState::getSystemUserID()
+	{
+		// TODO: Retrieve a unique User ID for the current running session
+		return "amc";
+	}
 
 }
diff --git a/Implementation/Core/amc_systemstate.hpp b/Implementation/Core/amc_systemstate.hpp
index a505b070..67a62e99 100644
--- a/Implementation/Core/amc_systemstate.hpp
+++ b/Implementation/Core/amc_systemstate.hpp
@@ -32,23 +32,50 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_SYSTEMSTATE
 #define __AMC_SYSTEMSTATE
 
-#include "amc_logger.hpp"
-#include "amc_parameterhandler.hpp"
-#include "amc_statesignalhandler.hpp"
-#include "amc_driverhandler.hpp"
-#include "amc_toolpathhandler.hpp"
+#include <memory>
+#include <map>
+#include <string>
+
+namespace LibMCData {
+	class CDataModel;
+	class CStorage;
+	class CBuildJobHandler;
+
+	typedef std::shared_ptr<CDataModel> PDataModel;
+	typedef std::shared_ptr<CStorage> PStorage;
+	typedef std::shared_ptr<CBuildJobHandler> PBuildJobHandler;
+}
 
-#include "libmcdata_dynamic.hpp"
+namespace LibMCDriverEnv {
+	class CWrapper;
+	typedef std::shared_ptr<CWrapper> PWrapper;
+}
 
 
 namespace AMC {
 
+	class CLogger;
+	class CStateSignalHandler;
+	class CDriverHandler;
+	class CToolpathHandler;
+	class CServiceHandler;
+	class CUIHandler;
+
+	typedef std::shared_ptr<CLogger> PLogger;
+	typedef std::shared_ptr<CStateSignalHandler> PStateSignalHandler;
+	typedef std::shared_ptr<CDriverHandler> PDriverHandler;
+	typedef std::shared_ptr<CToolpathHandler> PToolpathHandler;
+	typedef std::shared_ptr<CServiceHandler> PServiceHandler;
+	typedef std::shared_ptr<CUIHandler> PUIHandler;
+
 	class CSystemState {
 	private:
 		AMC::PLogger m_pLogger;
 		AMC::PStateSignalHandler m_pSignalHandler;
 		AMC::PDriverHandler m_pDriverHandler;
 		AMC::PToolpathHandler m_pToolpathHandler;
+		AMC::PServiceHandler m_pServiceHandler;
+		AMC::PUIHandler m_pUIHandler;
 		
 		LibMCData::PDataModel m_pDataModel;
 		LibMCData::PStorage m_pStorage;
@@ -65,6 +92,11 @@ namespace AMC {
 		CStateSignalHandler* stateSignalHandler();
 		CDriverHandler* driverHandler();
 		CToolpathHandler* toolpathHandler();
+		CServiceHandler* serviceHandler();
+		CUIHandler* uiHandler();
+
+		LibMCData::CStorage * storage();
+		LibMCData::CBuildJobHandler * buildJobHandler();
 
 		PLogger getLoggerInstance();
 		PStateSignalHandler getStateSignalHandlerInstance();
@@ -74,6 +106,8 @@ namespace AMC {
 		void addLibraryPath(const std::string & sLibraryName, const std::string & sLibraryPath);
 		std::string getLibraryPath(const std::string& sLibraryName);
 
+		std::string getSystemUserID();
+
 
 	};
 	
diff --git a/Implementation/Core/amc_toolpathentity.cpp b/Implementation/Core/amc_toolpathentity.cpp
index 7ebff6a6..2b9f6038 100644
--- a/Implementation/Core/amc_toolpathentity.cpp
+++ b/Implementation/Core/amc_toolpathentity.cpp
@@ -99,7 +99,17 @@ namespace AMC {
 		double dUnits = m_pToolpath->GetUnits();
 
 		auto p3MFLayerData = m_pToolpath->ReadLayerData(nLayerIndex);
-		return std::make_shared<CToolpathLayerData> (p3MFLayerData, dUnits);
+		auto nZValue = m_pToolpath->GetLayerZ(nLayerIndex);
+		return std::make_shared<CToolpathLayerData> (p3MFLayerData, dUnits, nZValue);
+	}
+
+
+	double CToolpathEntity::getUnits()
+	{
+		std::lock_guard<std::mutex> lockGuard(m_Mutex);
+
+		return m_pToolpath->GetUnits();
+
 	}
 
 
diff --git a/Implementation/Core/amc_toolpathentity.hpp b/Implementation/Core/amc_toolpathentity.hpp
index 21080d12..74c8863d 100644
--- a/Implementation/Core/amc_toolpathentity.hpp
+++ b/Implementation/Core/amc_toolpathentity.hpp
@@ -71,6 +71,8 @@ namespace AMC {
 
 		PToolpathLayerData readLayer(uint32_t nLayerIndex);
 
+		double getUnits();
+
 	};
 
 	
diff --git a/Implementation/Core/amc_toolpathhandler.cpp b/Implementation/Core/amc_toolpathhandler.cpp
index 81eda017..d680f3d0 100644
--- a/Implementation/Core/amc_toolpathhandler.cpp
+++ b/Implementation/Core/amc_toolpathhandler.cpp
@@ -53,9 +53,9 @@ namespace AMC {
 
 	}
 
-	CToolpathEntity* CToolpathHandler::findToolpathEntity(const std::string& sUUID, bool bFailIfNotExistent)
+	CToolpathEntity* CToolpathHandler::findToolpathEntity(const std::string& sStreamUUID, bool bFailIfNotExistent)
 	{
-		auto iIter = m_Entities.find(sUUID);
+		auto iIter = m_Entities.find(sStreamUUID);
 		if (iIter != m_Entities.end()) {
 			return iIter->second.get();
 		}
@@ -66,24 +66,19 @@ namespace AMC {
 		return nullptr;
 	}
 	
-	CToolpathEntity* CToolpathHandler::loadToolpathEntity(const std::string& sJobUUID)
+	CToolpathEntity* CToolpathHandler::loadToolpathEntity(const std::string& sStreamUUID)
 	{
-		if (sJobUUID.empty())
+		if (sStreamUUID.empty())
 			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
 
-		auto pToolpathEntity = findToolpathEntity(sJobUUID, false);
+		auto pToolpathEntity = findToolpathEntity(sStreamUUID, false);
 		if (pToolpathEntity == nullptr) {
 
-			if (m_pLib3MFWrapper.get() == nullptr) {
-				if (m_sLib3MFPath.empty ())
-					throw ELibMCInterfaceException(LIBMC_ERROR_NO3MFLIBRARY);
-				m_pLib3MFWrapper = Lib3MF::CWrapper::loadLibrary(m_sLib3MFPath);
-			}
+			auto pStorageStream = m_pStorage->RetrieveStream(sStreamUUID);
 
-			auto pBuildJob = m_pBuildJobHandler->RetrieveJob(sJobUUID);			
-			auto pNewToolpathEntity = std::make_shared<CToolpathEntity>(pBuildJob->GetStorageStream(), m_pLib3MFWrapper);
+			auto pNewToolpathEntity = std::make_shared<CToolpathEntity>(pStorageStream, getLib3MFWrapper());
 			pNewToolpathEntity->IncRef();
-			m_Entities.insert(std::make_pair(sJobUUID, pNewToolpathEntity));
+			m_Entities.insert(std::make_pair(sStreamUUID, pNewToolpathEntity));
 			return pNewToolpathEntity.get();
 
 		}
@@ -93,11 +88,11 @@ namespace AMC {
 		}
 	}
 
-	void CToolpathHandler::unloadToolpathEntity(const std::string& sUUID)
+	void CToolpathHandler::unloadToolpathEntity(const std::string& sStreamUUID)
 	{
-		auto pToolpathEntity = findToolpathEntity(sUUID, true);
+		auto pToolpathEntity = findToolpathEntity(sStreamUUID, true);
 		if (pToolpathEntity->DecRef())
-			m_Entities.erase(sUUID);
+			m_Entities.erase(sStreamUUID);
 	}
 
 
@@ -108,8 +103,24 @@ namespace AMC {
 
 	void CToolpathHandler::setLibraryPath(const std::string& sLibraryName, const std::string sLibraryPath)
 	{
-		if (sLibraryName == LIBRARYNAME_LIB3MF)
+		if (sLibraryName == LIBRARYNAME_LIB3MF) {		
 			m_sLib3MFPath = sLibraryPath;
+			getLib3MFWrapper();
+		}
+
+
+	}
+
+	Lib3MF::PWrapper CToolpathHandler::getLib3MFWrapper()
+	{
+		if (m_pLib3MFWrapper.get() == nullptr) {
+			if (m_sLib3MFPath.empty())
+				throw ELibMCInterfaceException(LIBMC_ERROR_NO3MFLIBRARY);
+			m_pLib3MFWrapper = Lib3MF::CWrapper::loadLibrary(m_sLib3MFPath);
+		}
+
+		return m_pLib3MFWrapper;
+
 	}
 
 
diff --git a/Implementation/Core/amc_toolpathhandler.hpp b/Implementation/Core/amc_toolpathhandler.hpp
index d9f65c18..417aacf8 100644
--- a/Implementation/Core/amc_toolpathhandler.hpp
+++ b/Implementation/Core/amc_toolpathhandler.hpp
@@ -62,13 +62,15 @@ namespace AMC {
 		CToolpathHandler(LibMCData::PStorage pStorage, LibMCData::PBuildJobHandler pBuildJobHandler);
 		virtual ~CToolpathHandler();
 
-		CToolpathEntity * findToolpathEntity(const std::string & sUUID, bool bFailIfNotExistent);
-		CToolpathEntity* loadToolpathEntity(const std::string& sUUID);
+		CToolpathEntity * findToolpathEntity(const std::string & sStreamUUID, bool bFailIfNotExistent);
+		CToolpathEntity* loadToolpathEntity(const std::string& sStreamUUID);
 		
-		void unloadToolpathEntity (const std::string& sUUID);
+		void unloadToolpathEntity (const std::string& sStreamUUID);
 		void unloadAllEntities();
 
 		void setLibraryPath(const std::string& sLibraryName, const std::string sLibraryPath);
+
+		Lib3MF::PWrapper getLib3MFWrapper();
 		
 	};
 
diff --git a/Implementation/Core/amc_toolpathlayerdata.cpp b/Implementation/Core/amc_toolpathlayerdata.cpp
index c9d10ac6..b30625da 100644
--- a/Implementation/Core/amc_toolpathlayerdata.cpp
+++ b/Implementation/Core/amc_toolpathlayerdata.cpp
@@ -34,8 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace AMC {
 
-	CToolpathLayerData::CToolpathLayerData(Lib3MF::PToolpathLayerReader p3MFLayer, double dUnits)
-		: m_dUnits (dUnits)
+	CToolpathLayerData::CToolpathLayerData(Lib3MF::PToolpathLayerReader p3MFLayer, double dUnits, int32_t nZValue)
+		: m_dUnits (dUnits), m_nZValue (nZValue)
 	{
 		if (p3MFLayer.get() == nullptr)
 			throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
@@ -84,8 +84,8 @@ namespace AMC {
 
 				for (uint32_t nPointIndex = 0; nPointIndex < pSegment->m_PointCount; nPointIndex++) {
 					
-					pDstPoint->m_Coordinates[0] = pSrcPoint->m_Coordinates[0];
-					pDstPoint->m_Coordinates[1] = pSrcPoint->m_Coordinates[1];
+					pDstPoint->m_Coordinates[0] = (int) pSrcPoint->m_Coordinates[0];
+					pDstPoint->m_Coordinates[1] = (int) pSrcPoint->m_Coordinates[1];
 					pSrcPoint++;
 					pDstPoint++;
 					
@@ -194,6 +194,16 @@ namespace AMC {
 		return getRegisteredUUID(m_Segments[nSegmentIndex].m_PartID);
 	}
 
+	double CToolpathLayerData::getUnits()
+	{
+		return m_dUnits;
+	}
+
+	int32_t CToolpathLayerData::getZValue()
+	{
+		return m_nZValue;
+	}
+
 
 }
 
diff --git a/Implementation/Core/amc_toolpathlayerdata.hpp b/Implementation/Core/amc_toolpathlayerdata.hpp
index 883111b6..f18f3f89 100644
--- a/Implementation/Core/amc_toolpathlayerdata.hpp
+++ b/Implementation/Core/amc_toolpathlayerdata.hpp
@@ -55,6 +55,7 @@ namespace AMC {
 	class CToolpathLayerData {
 	private:
 		double m_dUnits;
+		int32_t m_nZValue;
 		std::string m_sUUID;
 		
 		std::vector<sToolpathLayerSegment> m_Segments;
@@ -69,7 +70,7 @@ namespace AMC {
 
 	public:
 
-		CToolpathLayerData(Lib3MF::PToolpathLayerReader p3MFLayer, double dUnits);
+		CToolpathLayerData(Lib3MF::PToolpathLayerReader p3MFLayer, double dUnits, int32_t nZValue);
 		virtual ~CToolpathLayerData();		
 
 		std::string getUUID ();
@@ -83,6 +84,10 @@ namespace AMC {
 		std::string getSegmentProfileUUID(const uint32_t nSegmentIndex);
 		std::string getSegmentPartUUID(const uint32_t nSegmentIndex);
 
+		double getUnits();
+
+		int32_t getZValue ();
+
 	};
 
 
diff --git a/Implementation/DataModel/amcdata_databasemigrator_buildjobs.cpp b/Implementation/DataModel/amcdata_databasemigrator_buildjobs.cpp
index 787ae408..59ae4504 100644
--- a/Implementation/DataModel/amcdata_databasemigrator_buildjobs.cpp
+++ b/Implementation/DataModel/amcdata_databasemigrator_buildjobs.cpp
@@ -46,10 +46,25 @@ namespace AMCData {
 			sBuildJobsQuery += "`name`  varchar ( 256 ) NOT NULL,";
 			sBuildJobsQuery += "`status`  varchar ( 64 ) NOT NULL,";
 			sBuildJobsQuery += "`storagestreamuuid`  varchar ( 64 ) NOT NULL,";
+			sBuildJobsQuery += "`layercount` integer DEFAULT 0,";
 			sBuildJobsQuery += "`userid`  varchar ( 64 ) NOT NULL,";
+			sBuildJobsQuery += "`updateuuid`  varchar ( 64 ),";
 			sBuildJobsQuery += "`timestamp`  varchar ( 64 ) NOT NULL)";
 			pTransaction->executeStatement(sBuildJobsQuery);
 
+			std::string sBuildJobDataQuery = "CREATE TABLE `buildjobdata` (";
+			sBuildJobDataQuery += "`uuid`  varchar ( 64 ) UNIQUE NOT NULL,";
+			sBuildJobDataQuery += "`jobuuid`  varchar ( 64 ) NOT NULL,";
+			sBuildJobDataQuery += "`storagestreamuuid`  varchar ( 64 ) NOT NULL,";
+			sBuildJobDataQuery += "`name`  varchar ( 256 ) NOT NULL,";
+			sBuildJobDataQuery += "`datatype`  varchar ( 64 ) NOT NULL,";
+			sBuildJobDataQuery += "`userid`  varchar ( 64 ) NOT NULL,";
+			sBuildJobDataQuery += "`updateuuid`  varchar ( 64 ),";
+			sBuildJobDataQuery += "`active`  integer DEFAULT 0,";
+			sBuildJobDataQuery += "`timestamp`  varchar ( 64 ) NOT NULL)";
+			pTransaction->executeStatement(sBuildJobDataQuery);
+
+
 			break;
 		}
 
diff --git a/Implementation/DataModel/amcdata_databasemigrator_storage.cpp b/Implementation/DataModel/amcdata_databasemigrator_storage.cpp
index 564c576b..8c6a6031 100644
--- a/Implementation/DataModel/amcdata_databasemigrator_storage.cpp
+++ b/Implementation/DataModel/amcdata_databasemigrator_storage.cpp
@@ -43,15 +43,21 @@ namespace AMCData {
 		case 0: {
 				std::string sStreamsQuery = "CREATE TABLE `storage_streams` (";
 				sStreamsQuery += "`uuid`  varchar ( 64 ) UNIQUE NOT NULL,";
-				sStreamsQuery += "`contextuuid`  varchar ( 64 ) NOT NULL,";
 				sStreamsQuery += "`name`  varchar ( 256 ) NOT NULL,";
 				sStreamsQuery += "`mimetype`  varchar ( 256 ) NOT NULL,";
 				sStreamsQuery += "`sha2`  varchar ( 64 ) NOT NULL,";
 				sStreamsQuery += "`size`  integer DEFAULT 0,";
+				sStreamsQuery += "`status`  varchar ( 256 ) NOT NULL,";
 				sStreamsQuery += "`userid`  varchar ( 64 ) NOT NULL,";
+				sStreamsQuery += "`updateuuid`  varchar ( 64 ),";
 				sStreamsQuery += "`timestamp`  varchar ( 64 ) NOT NULL)";
 				pTransaction->executeStatement(sStreamsQuery);
 
+				std::string sContextQuery = "CREATE TABLE `storage_context` (";
+				sContextQuery += "`streamuuid`  varchar ( 64 ) NOT NULL,";
+				sContextQuery += "`contextuuid`  varchar ( 64 ) NOT NULL)";
+				pTransaction->executeStatement(sContextQuery);
+
 				std::string sAccessQuery = "CREATE TABLE `storage_access` (";
 				sAccessQuery += "`streamuuid`  varchar ( 64 ) NOT NULL,";
 				sAccessQuery += "`userid`  varchar ( 64 ) NOT NULL,";
diff --git a/Implementation/DataModel/amcdata_sqlstatement.hpp b/Implementation/DataModel/amcdata_sqlstatement.hpp
index 1a2dc03a..7138cb41 100644
--- a/Implementation/DataModel/amcdata_sqlstatement.hpp
+++ b/Implementation/DataModel/amcdata_sqlstatement.hpp
@@ -81,6 +81,7 @@ namespace AMCData {
 		virtual int32_t getColumnInt(uint32_t nIdx) = 0;
 		virtual int64_t getColumnInt64(uint32_t nIdx) = 0;
 		virtual eSQLColumnType getColumnType(uint32_t nIdx) = 0;
+		virtual std::string getColumnUUID(uint32_t nIdx) = 0;
 
 
 	};
diff --git a/Implementation/DataModel/amcdata_sqlstatement_sqlite.cpp b/Implementation/DataModel/amcdata_sqlstatement_sqlite.cpp
index 8a80583e..6cfabb08 100644
--- a/Implementation/DataModel/amcdata_sqlstatement_sqlite.cpp
+++ b/Implementation/DataModel/amcdata_sqlstatement_sqlite.cpp
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "amcdata_sqlstatement_sqlite.hpp"
 #include "libmcdata_interfaceexception.hpp"
 #include "sqlite3.h"
+#include "common_utils.hpp"
 
 namespace AMCData {
 
@@ -146,6 +147,11 @@ namespace AMCData {
 
 	}
 
+	std::string CSQLStatement_SQLite::getColumnUUID(uint32_t nIdx)
+	{
+		return AMCCommon::CUtils::normalizeUUIDString (getColumnString (nIdx));
+	}
+
 	double CSQLStatement_SQLite::getColumnDouble(uint32_t nIdx)
 	{
 		if (!m_bHasColumn)
diff --git a/Implementation/DataModel/amcdata_sqlstatement_sqlite.hpp b/Implementation/DataModel/amcdata_sqlstatement_sqlite.hpp
index 80838f2a..5a8fef48 100644
--- a/Implementation/DataModel/amcdata_sqlstatement_sqlite.hpp
+++ b/Implementation/DataModel/amcdata_sqlstatement_sqlite.hpp
@@ -79,6 +79,7 @@ namespace AMCData {
 		int32_t getColumnInt (uint32_t nIdx) override;
 		int64_t getColumnInt64 (uint32_t nIdx) override;
 		eSQLColumnType getColumnType (uint32_t nIdx) override;
+		std::string getColumnUUID(uint32_t nIdx) override;
 
 		static void checkSQLiteError(int nError);
 		
diff --git a/Implementation/DataModel/amcdata_storagepath.cpp b/Implementation/DataModel/amcdata_storagepath.cpp
index a95e3e08..fea6d4a2 100644
--- a/Implementation/DataModel/amcdata_storagepath.cpp
+++ b/Implementation/DataModel/amcdata_storagepath.cpp
@@ -53,6 +53,28 @@ namespace AMCData {
 		return m_sDataPath + "/log_" + sTimeFileName + ".db";
 	}
 
+	std::string CStoragePath::storageStreamStatusToString(eStorageStreamStatus eStatus)
+	{
+		switch (eStatus) {
+		case sssNew: return "new";
+		case sssValidated: return "validated";
+		case sssArchived: return "archived";
+		default: 
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDSTORAGESTREAMSTATUS);
+		}
+	}
+
+	eStorageStreamStatus CStoragePath::stringToStorageStreamStatus(const std::string& sStatus)
+	{
+		if (sStatus == "new")
+			return sssNew;
+		if (sStatus == "validated")
+			return sssValidated;
+		if (sStatus == "archived")
+			return sssArchived;
+
+		throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDSTORAGESTREAMSTATUS);
+	}
 
 }
 
diff --git a/Implementation/DataModel/amcdata_storagepath.hpp b/Implementation/DataModel/amcdata_storagepath.hpp
index 8ef4e236..8897c77c 100644
--- a/Implementation/DataModel/amcdata_storagepath.hpp
+++ b/Implementation/DataModel/amcdata_storagepath.hpp
@@ -39,9 +39,15 @@ namespace AMCData {
 
 
 /*************************************************************************************************************************
- Class declaration of CStorage 
+ Class declaration of CStoragePath
 **************************************************************************************************************************/
 
+typedef enum {
+    sssNew = 0,
+    sssValidated = 1,
+    sssArchived = 2
+} eStorageStreamStatus;
+
 class CStoragePath {
 private:
     std::string m_sDataPath;
@@ -53,6 +59,9 @@ class CStoragePath {
     std::string getStreamPath(const std::string& sStreamUUID);
     std::string getLogPath();
 
+    static std::string storageStreamStatusToString(eStorageStreamStatus eStatus);
+    static eStorageStreamStatus stringToStorageStreamStatus(const std::string & sStatus);
+
 };
 
 typedef std::shared_ptr <CStoragePath> PStoragePath;
diff --git a/Implementation/DataModel/amcdata_storagewriter.cpp b/Implementation/DataModel/amcdata_storagewriter.cpp
index 0ba3da57..4fcefad2 100644
--- a/Implementation/DataModel/amcdata_storagewriter.cpp
+++ b/Implementation/DataModel/amcdata_storagewriter.cpp
@@ -33,12 +33,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "common_utils.hpp"
 #include "common_exportstream_native.hpp"
+#include "common_importstream_native.hpp"
+
+#include "PicoSHA2/picosha2.h"
 
 namespace AMCData {
 
 
-	CStorageWriter::CStorageWriter(const std::string& sUUID, const std::string& sPath, uint64_t nSize)
-		: m_nSize (nSize), m_sUUID (AMCCommon::CUtils::normalizeUUIDString (sUUID)), m_sPath (sPath)
+	CStorageWriter::CStorageWriter(const std::string& sUUID, const std::string& sPath, uint64_t nSize, const std::string& sNeededSHA256)	
+		: m_nSize (nSize), m_sUUID (AMCCommon::CUtils::normalizeUUIDString (sUUID)), m_sPath (sPath), m_sNeededSHA256 (sNeededSHA256)
 	{
 		m_pExportStream = std::make_shared<AMCCommon::CExportStream_Native>(sPath);
 	}
@@ -53,15 +56,51 @@ namespace AMCData {
 
 	void CStorageWriter::writeChunkAsync(const uint8_t* pChunkData, const uint64_t nChunkSize, const uint64_t nOffset)
 	{
-		// TODO: Create Threading
-		m_pExportStream->writeBuffer(pChunkData, nOffset);
+		if (nChunkSize > 0) {
+			m_pExportStream->seekFromEnd(0, true);
+			auto nSize = m_pExportStream->getPosition();
+
+			if (nOffset > nSize) {
+				m_pExportStream->writeZeros(nOffset - nSize);
+			}
+
+			if (nOffset < nSize) {
+				m_pExportStream->seekPosition(nOffset, true);
+			}
+
+
+			m_pExportStream->writeBuffer(pChunkData, nChunkSize);
+		}
 
 	}
 
 	void CStorageWriter::finalize()
 	{
-		m_pExportStream = nullptr;
+		if (m_pExportStream.get() == nullptr) 
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_NOCURRENTUPLOAD);
+		
+		try {	
 
+			m_pExportStream->seekFromEnd(0, true);
+			auto nSize = m_pExportStream->getPosition();
+			if (m_nSize != nSize)
+				throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_UPLOADSIZEMISMATCH);
+
+			// Free ExportStream and close file
+			m_pExportStream = nullptr;
+
+			auto sSHA256 = AMCCommon::CUtils::calculateSHA256FromFile(m_sPath);
+			if (sSHA256 != m_sNeededSHA256)
+				throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_UPLOADCHECKSUMMISMATCH);
+		}
+		catch (ELibMCDataInterfaceException & EDataException) {
+			AMCCommon::CUtils::deleteFileFromDisk(m_sPath, false);
+			throw EDataException;
+		}
+		catch (std::exception& StdException) {
+			AMCCommon::CUtils::deleteFileFromDisk(m_sPath, false);
+			throw StdException;
+		}
 	}
 
 
diff --git a/Implementation/DataModel/amcdata_storagewriter.hpp b/Implementation/DataModel/amcdata_storagewriter.hpp
index ffa268ba..b322f768 100644
--- a/Implementation/DataModel/amcdata_storagewriter.hpp
+++ b/Implementation/DataModel/amcdata_storagewriter.hpp
@@ -47,12 +47,13 @@ class CStorageWriter {
 private:
     std::string m_sUUID;
     std::string m_sPath;
+    std::string m_sNeededSHA256;
 	uint64_t m_nSize;
     AMCCommon::PExportStream m_pExportStream;
 
 public:
 
-    CStorageWriter(const std::string & sUUID, const std::string & sPath, uint64_t nSize);
+    CStorageWriter(const std::string & sUUID, const std::string & sPath, uint64_t nSize, const std::string & sNeededSHA256);
 
     ~CStorageWriter();
 	
diff --git a/Implementation/LibMC/libmc_apirequesthandler.cpp b/Implementation/LibMC/libmc_apirequesthandler.cpp
new file mode 100644
index 00000000..3cc01ae5
--- /dev/null
+++ b/Implementation/LibMC/libmc_apirequesthandler.cpp
@@ -0,0 +1,171 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CAPIRequestHandler
+
+*/
+
+#define __AMCIMPL_API_CONSTANTS
+
+#include "libmc_apirequesthandler.hpp"
+#include "libmc_interfaceexception.hpp"
+#include "amc_api_constants.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibMC::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CAPIRequestHandler 
+**************************************************************************************************************************/
+
+CAPIRequestHandler::CAPIRequestHandler(AMC::PAPI pAPI, const std::string& sURI, const std::string& sRequestMethod, AMC::PAPIAuth pAuth)
+    : m_RequestType(AMC::eAPIRequestType::rtUnknown), m_pAPI (pAPI), m_pAuth (pAuth)
+{
+    if (pAPI.get() == nullptr)
+        throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+    if (pAuth.get() == nullptr)
+        throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+
+    if (sURI.length() > 0) {
+        if (sURI.substr(0, 1) == "/")
+            m_sURIWithoutLeadingSlash = sURI.substr(1);
+        else
+            m_sURIWithoutLeadingSlash = sURI;
+    }
+
+    if (sRequestMethod == "GET")
+        m_RequestType = AMC::eAPIRequestType::rtGet;
+    if (sRequestMethod == "POST")
+        m_RequestType = AMC::eAPIRequestType::rtPost;
+
+    if (m_RequestType == AMC::eAPIRequestType::rtUnknown)
+        throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDAPIREQUESTTYPE);
+
+}
+
+
+
+
+bool CAPIRequestHandler::ExpectsRawBody()
+{
+    return m_pAPI->expectsRawBody (m_sURIWithoutLeadingSlash, m_RequestType);
+}
+
+bool CAPIRequestHandler::ExpectsFormData(LibMC_uint32 & nFieldCount)
+{
+    nFieldCount = m_pAPI->getFormDataFieldCount(m_sURIWithoutLeadingSlash, m_RequestType);
+    return (nFieldCount > 0);
+}
+
+void CAPIRequestHandler::GetFormDataDetails(const LibMC_uint32 nFieldIndex, std::string & sName, bool& bIsFile, bool & bMandatory)
+{
+    auto fieldDetails = m_pAPI->getFormDataFieldDetails(m_sURIWithoutLeadingSlash, m_RequestType, nFieldIndex);
+    sName = fieldDetails.m_sFieldName;
+    bIsFile = fieldDetails.m_bIsFileData;
+    bMandatory = fieldDetails.m_bIsMandatory;
+}
+
+
+void CAPIRequestHandler::SetFormDataField(const std::string & sName, const LibMC_uint64 nBodyBufferSize, const LibMC_uint8 * pBodyBuffer)
+{
+    auto pData = std::make_shared<std::vector<uint8_t>> ();
+
+    if (pBodyBuffer != nullptr) {
+        pData->resize(nBodyBufferSize);
+        if (nBodyBufferSize > 0) {
+            auto pSrc = pBodyBuffer;
+            auto pDst = pData->data();
+            for (LibMC_uint64 nIndex = 0; nIndex < nBodyBufferSize; nIndex++) {
+                *pDst = *pSrc;
+                pDst++;
+                pSrc++;
+            }
+        }
+    }
+    else {
+        if (nBodyBufferSize > 0)
+            throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+    }
+
+    m_FormFields.addDataField (sName, pData);
+}
+
+void CAPIRequestHandler::SetFormStringField(const std::string& sName, const std::string& sString)
+{
+    m_FormFields.addStringField(sName, sString);
+}
+
+
+void CAPIRequestHandler::Handle(const LibMC_uint64 nRawBodyBufferSize, const LibMC_uint8* pRawBodyBuffer, std::string& sContentType, LibMC_uint32& nHTTPCode)
+{
+
+    if (m_pResponse.get() != nullptr)
+        throw ELibMCInterfaceException(LIBMC_ERROR_APIREQUESTALREADYHANDLED);
+
+    m_pResponse = m_pAPI->handleRequest(m_sURIWithoutLeadingSlash, m_RequestType, pRawBodyBuffer, nRawBodyBufferSize, m_FormFields, m_pAuth);
+
+    if (m_pResponse.get() == nullptr)
+        throw ELibMCInterfaceException(LIBMC_ERROR_INTERNALERROR);
+
+    sContentType = m_pResponse->getContentType();
+
+    nHTTPCode = m_pResponse->getHTTPCode ();
+}
+
+void CAPIRequestHandler::GetResultData(LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer)
+{
+
+    if (m_pResponse.get() == nullptr)
+        throw ELibMCInterfaceException(LIBMC_ERROR_APIREQUESTNOTHANDLED);
+
+	uint64_t nStreamSize = (uint64_t)m_pResponse->getStreamSize();
+
+	if (pDataNeededCount != nullptr) {
+		*pDataNeededCount = nStreamSize;
+	}
+
+	if (pDataBuffer != nullptr) {
+
+		if (nDataBufferSize < nStreamSize)
+			throw ELibMCInterfaceException(LIBMC_ERROR_BUFFERTOOSMALL);
+
+		if (m_pResponse.get() != nullptr) {
+			const uint8_t* pSrc = m_pResponse->getStreamData();
+			uint8_t* pDst = pDataBuffer;
+
+			for (uint64_t nIndex = 0; nIndex < nStreamSize; nIndex++) {
+				*pDst = *pSrc; pDst++; pSrc++;
+			}
+		}
+	}
+
+}
+
diff --git a/Implementation/LibMC/libmc_apirequesthandler.hpp b/Implementation/LibMC/libmc_apirequesthandler.hpp
new file mode 100644
index 00000000..1c524194
--- /dev/null
+++ b/Implementation/LibMC/libmc_apirequesthandler.hpp
@@ -0,0 +1,102 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CAPIRequestHandler
+
+*/
+
+
+#ifndef __LIBMC_APIREQUESTHANDLER
+#define __LIBMC_APIREQUESTHANDLER
+
+#include "libmc_interfaces.hpp"
+#include "API/amc_api_handler.hpp"
+#include "API/amc_api_response.hpp"
+#include "API/amc_api.hpp"
+
+// Parent classes
+#include "libmc_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+#include <map>
+
+namespace LibMC {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CAPIRequestHandler 
+**************************************************************************************************************************/
+
+class CAPIRequestHandler : public virtual IAPIRequestHandler, public virtual CBase {
+private:
+
+
+protected:
+
+	AMC::PAPI m_pAPI;
+	AMC::PAPIResponse m_pResponse;
+
+	std::string m_sURIWithoutLeadingSlash;
+	AMC::eAPIRequestType m_RequestType;
+
+	AMC::CAPIFormFields m_FormFields;
+	AMC::PAPIAuth m_pAuth;
+
+public:
+
+	CAPIRequestHandler(AMC::PAPI pAPI, const std::string& sURI, const std::string& sRequestMethod, AMC::PAPIAuth pAuth);
+
+	bool ExpectsRawBody() override;
+
+	bool ExpectsFormData(LibMC_uint32 & nFieldCount) override;
+
+	void GetFormDataDetails(const LibMC_uint32 nFieldIndex, std::string & sName, bool& bIsFile, bool & bMandatory) override;
+
+	void SetFormDataField(const std::string & sName, const LibMC_uint64 nBodyBufferSize, const LibMC_uint8 * pBodyBuffer) override;
+
+	void SetFormStringField(const std::string& sName, const std::string& sString) override;
+
+	void Handle(const LibMC_uint64 nRawBodyBufferSize, const LibMC_uint8* pRawBodyBuffer, std::string& sContentType, LibMC_uint32& nHTTPCode) override;
+
+	void GetResultData(LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer) override;
+	
+};
+
+} // namespace Impl
+} // namespace LibMC
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBMC_APIREQUESTHANDLER
diff --git a/Implementation/LibMC/libmc_mccontext.cpp b/Implementation/LibMC/libmc_mccontext.cpp
index b23b7c8a..cf5c017c 100644
--- a/Implementation/LibMC/libmc_mccontext.cpp
+++ b/Implementation/LibMC/libmc_mccontext.cpp
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "libmc_mccontext.hpp"
 #include "libmc_interfaceexception.hpp"
-#include "libmc_apiresponse.hpp"
+#include "libmc_apirequesthandler.hpp"
 #include "pugixml.hpp"
 
 #include "libmcdriverenv_interfaces.hpp"
@@ -41,12 +41,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "amc_logger_multi.hpp"
 #include "amc_logger_stdout.hpp"
 #include "amc_logger_database.hpp"
+#include "amc_servicehandler.hpp"
+#include "amc_ui_handler.hpp"
 
-#include "API/amc_api_handler_logs.hpp"
-#include "API/amc_api_handler_setup.hpp"
-#include "API/amc_api_handler_status.hpp"
-#include "API/amc_api_handler_root.hpp"
-
+#include "API/amc_api_factory.hpp"
 
 // Include custom headers here.
 #include <iostream>
@@ -78,9 +76,7 @@ CMCContext::CMCContext(LibMCData::PDataModel pDataModel)
 
     // Create API Handlers for data model requests
     m_pAPI = std::make_shared<AMC::CAPI>();
-    m_pAPI->registerHandler(std::make_shared <CAPIHandler_Logs> (m_pSystemState->getLoggerInstance ()));
-    m_pAPI->registerHandler(std::make_shared <CAPIHandler_Setup>(m_InstanceList));
-    m_pAPI->registerHandler(std::make_shared <CAPIHandler_Status>(m_InstanceList));
+    CAPIFactory factory (m_pAPI, m_pSystemState, m_InstanceList);
 
     // Create Client Dist Handler
     m_pClientDistHandler = std::make_shared <CAPIHandler_Root>();
@@ -110,6 +106,25 @@ void CMCContext::ParseConfiguration(const std::string & sXMLString)
     if (xmlns != MACHINEDEFINITION_XMLSCHEMA)
         throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDXMLSCHEMA);
 
+    auto servicesNode = machinedefinitionNode.child("services");
+    if (servicesNode.empty ())
+        throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGSERVICESNODE);
+
+    auto threadCountAttrib = servicesNode.attribute("threadcount");
+    if (threadCountAttrib.empty())
+        throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGTHREADCOUNT);
+    auto nMaxThreadCount = threadCountAttrib.as_uint();
+    if ((nMaxThreadCount < SERVICETHREADCOUNT_MIN) || (nMaxThreadCount > SERVICETHREADCOUNT_MAX))
+        throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDTHREADCOUNT);
+    m_pSystemState->serviceHandler()->setMaxThreadCount((uint32_t) nMaxThreadCount);
+
+
+    // Load User Interface
+    auto userInterfaceNode = machinedefinitionNode.child("userinterface");
+    if (userInterfaceNode.empty())
+        throw ELibMCInterfaceException(LIBMC_ERROR_NOUSERINTERFACEDEFINITION);
+    m_pSystemState->uiHandler ()->loadFromXML (userInterfaceNode);
+
 
     m_pSystemState->logger()->logMessage("Loading drivers...", LOG_SUBSYSTEM_SYSTEM, AMC::eLogLevel::Message);
     auto driversNodes = machinedefinitionNode.children("driver");
@@ -283,6 +298,7 @@ AMC::PStateMachineInstance CMCContext::addMachineInstance(const pugi::xml_node&
     pInstance->setInitState(sInitState);
     pInstance->setFailedState(sFailedState);
 
+    // load Plugin DLLs
     auto pPlugin = loadPlugin (m_pSystemState->getLibraryPath (slibraryName));
     LibMCPlugin::PStateFactory pStateFactory;
     try {
@@ -360,6 +376,8 @@ void CMCContext::readSignalParameters(const pugi::xml_node& xmlNode, std::list<A
 
 }
 
+
+
 void CMCContext::loadParameterGroup(const pugi::xml_node& xmlNode, AMC::PParameterGroup pGroup)
 {
     if (pGroup.get() == nullptr)
@@ -462,44 +480,12 @@ void CMCContext::Log(const std::string& sMessage, const LibMC::eLogSubSystem eSu
     m_pSystemState->logger()->logMessage (sMessage, sSubSystem, (AMC::eLogLevel) eLogLevel);
 }
 
-
-IAPIResponse* CMCContext::HandleAPIGetRequest(const std::string& sURI)
+IAPIRequestHandler* CMCContext::CreateAPIRequestHandler(const std::string& sURI, const std::string& sRequestMethod)
 {
+    auto sNewSessionUUID = AMCCommon::CUtils::createUUID();
 
-    std::string sURIWithoutLeadingSlash;
-    if (sURI.length() > 0) {
-        if (sURI.substr(0, 1) == "/")
-            sURIWithoutLeadingSlash = sURI.substr(1);
-        else
-            sURIWithoutLeadingSlash = sURI;
-    }
+    auto pAuth = std::make_shared<CAPIAuth>(sNewSessionUUID);
 
-    uint32_t nHTTPCode = AMC_API_HTTP_NOTFOUND;
-    auto pResponseObject = m_pAPI->handleGetRequest(sURIWithoutLeadingSlash, nHTTPCode);
+    return new CAPIRequestHandler(m_pAPI, sURI, sRequestMethod, pAuth);
 
-    if (pResponseObject.get() == nullptr)
-        throw ELibMCInterfaceException(LIBMC_ERROR_INTERNALERROR);
-    
-    return new CAPIResponse(pResponseObject, nHTTPCode);    
 }
-
-IAPIResponse* CMCContext::HandleAPIPostRequest(const std::string& sURI, const LibMC_uint64 nBodyBufferSize, const LibMC_uint8* pBodyBuffer)
-{
-    std::string sURIWithoutLeadingSlash;
-    if (sURI.length() > 0) {
-        if (sURI.substr(0, 1) == "/")
-            sURIWithoutLeadingSlash = sURI.substr(1);
-        else
-            sURIWithoutLeadingSlash = sURI;
-    }
-
-    uint32_t nHTTPCode = AMC_API_HTTP_NOTFOUND;
-    auto pResponseObject = m_pAPI->handlePostRequest(sURIWithoutLeadingSlash, pBodyBuffer, nBodyBufferSize, nHTTPCode);
-
-    if (pResponseObject.get() == nullptr)
-        throw ELibMCInterfaceException(LIBMC_ERROR_INTERNALERROR);
-
-    return new CAPIResponse(pResponseObject, nHTTPCode);
-}
-
-
diff --git a/Implementation/LibMC/libmc_mccontext.hpp b/Implementation/LibMC/libmc_mccontext.hpp
index 87c0586f..50cdaafb 100644
--- a/Implementation/LibMC/libmc_mccontext.hpp
+++ b/Implementation/LibMC/libmc_mccontext.hpp
@@ -91,7 +91,7 @@ class CMCContext : public virtual IMCContext, public virtual CBase {
 
 	void loadParameterGroup (const pugi::xml_node& xmlNode, AMC::PParameterGroup pGroup);
 	void readSignalParameters(const pugi::xml_node& xmlNode, std::list<AMC::CStateSignalParameter> & Parameters, std::list<AMC::CStateSignalParameter>& Results);
-	
+
 
 protected:
 
@@ -112,14 +112,14 @@ class CMCContext : public virtual IMCContext, public virtual CBase {
 
 	void LoadClientPackage(const LibMC_uint64 nZIPStreamBufferSize, const LibMC_uint8* pZIPStreamBuffer) override;
 
+	IAPIRequestHandler* CreateAPIRequestHandler(const std::string& sURI, const std::string& sRequestMethod) override;
+
 	AMC::PStateMachineInstance addMachineInstance (const pugi::xml_node & xmlNode);
 	AMC::PStateMachineInstance findMachineInstance (std::string sName, bool bFailIfNotExisting);	
 
 	void addDriver(const pugi::xml_node& xmlNode);
 
-	IAPIResponse* HandleAPIGetRequest(const std::string& sURI) override;
-
-	IAPIResponse* HandleAPIPostRequest(const std::string& sURI, const LibMC_uint64 nBodyBufferSize, const LibMC_uint8* pBodyBuffer) override;
+	
 
 
 };
diff --git a/Implementation/LibMCData/libmcdata_buildjob.cpp b/Implementation/LibMCData/libmcdata_buildjob.cpp
index b9d852e4..89415014 100644
--- a/Implementation/LibMCData/libmcdata_buildjob.cpp
+++ b/Implementation/LibMCData/libmcdata_buildjob.cpp
@@ -35,6 +35,9 @@ Abstract: This is a stub class definition of CBuildJob
 #include "libmcdata_interfaceexception.hpp"
 #include "libmcdata_storagestream.hpp"
 
+#include "libmcdata_buildjobdata.hpp"
+#include "libmcdata_buildjobdataiterator.hpp"
+
 // Include custom headers here.
 #include "common_utils.hpp"
 
@@ -44,7 +47,7 @@ using namespace LibMCData::Impl;
  Class definition of CBuildJob 
 **************************************************************************************************************************/
 
-CBuildJob::CBuildJob(const std::string& sUUID, const std::string sName, LibMCData::eBuildJobStatus eJobStatus, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
+CBuildJob::CBuildJob(const std::string& sUUID, const std::string sName, LibMCData::eBuildJobStatus eJobStatus, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, uint32_t nLayerCount, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
   : m_sUUID (AMCCommon::CUtils::normalizeUUIDString(sUUID)),
     m_sName (sName), 
     m_eJobStatus (eJobStatus), 
@@ -52,6 +55,7 @@ CBuildJob::CBuildJob(const std::string& sUUID, const std::string sName, LibMCDat
     m_sStorageStreamUUID (AMCCommon::CUtils::normalizeUUIDString(sStorageStreamUUID)),
     m_sUserID (sUserID),
     m_pSQLHandler(pSQLHandler),
+    m_nLayerCount(nLayerCount),
     m_pStoragePath (pStoragePath)
 {
     if (pSQLHandler.get() == nullptr)
@@ -66,9 +70,9 @@ CBuildJob::CBuildJob(const std::string& sUUID, const std::string sName, LibMCDat
         throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDUSERID);
 }
 
-CBuildJob* CBuildJob::make(const std::string& sUUID, const std::string sName, LibMCData::eBuildJobStatus eJobStatus, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
+CBuildJob* CBuildJob::make(const std::string& sUUID, const std::string sName, LibMCData::eBuildJobStatus eJobStatus, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, uint32_t nLayerCount, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
 {
-    return new CBuildJob(sUUID, sName, eJobStatus, sTimeStamp, sStorageStreamUUID, sUserID, pSQLHandler, pStoragePath);
+    return new CBuildJob(sUUID, sName, eJobStatus, sTimeStamp, sStorageStreamUUID, sUserID, nLayerCount, pSQLHandler, pStoragePath);
 }
 
 CBuildJob* CBuildJob::makeFromDatabase(const std::string& sJobUUID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
@@ -80,7 +84,7 @@ CBuildJob* CBuildJob::makeFromDatabase(const std::string& sJobUUID, AMCData::PSQ
 
     auto sParsedJobUUID = AMCCommon::CUtils::normalizeUUIDString(sJobUUID);
 
-    std::string sQuery = "SELECT uuid, name, status, timestamp, storagestreamuuid, userid FROM buildjobs WHERE uuid=?";
+    std::string sQuery = "SELECT uuid, name, status, timestamp, storagestreamuuid, layercount, userid FROM buildjobs WHERE uuid=?";
     auto pStatement = pSQLHandler->prepareStatement(sQuery);
     pStatement->setString(1, sParsedJobUUID);
     if (!pStatement->nextRow())
@@ -91,15 +95,24 @@ CBuildJob* CBuildJob::makeFromDatabase(const std::string& sJobUUID, AMCData::PSQ
     auto eJobStatus = convertStringToBuildJobStatus(pStatement->getColumnString(3));
     auto sTimeStamp = pStatement->getColumnString(4);
     auto sStorageStreamUUID = pStatement->getColumnString(5);
-    auto sUserID = pStatement->getColumnString(6);
+    auto nLayerCount = pStatement->getColumnInt(6);
+    auto sUserID = pStatement->getColumnString(7);
 
-    return make (sUUID, sName, eJobStatus, sTimeStamp, sStorageStreamUUID, sUserID, pSQLHandler, pStoragePath);
+    return make (sUUID, sName, eJobStatus, sTimeStamp, sStorageStreamUUID, sUserID, nLayerCount, pSQLHandler, pStoragePath);
 }
 
+CBuildJob* CBuildJob::makeFrom(CBuildJob* pBuildJob)
+{
+    if (pBuildJob == nullptr)
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
+
+    return make(pBuildJob->m_sUUID, pBuildJob->m_sName, pBuildJob->m_eJobStatus, pBuildJob->m_sTimeStamp, pBuildJob->m_sStorageStreamUUID, pBuildJob->m_sUserID,
+            pBuildJob->m_nLayerCount, pBuildJob->m_pSQLHandler, pBuildJob->m_pStoragePath);
+}
 
-PBuildJob CBuildJob::makeShared(const std::string& sUUID, const std::string sName, LibMCData::eBuildJobStatus eJobStatus, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
+PBuildJob CBuildJob::makeShared(const std::string& sUUID, const std::string sName, LibMCData::eBuildJobStatus eJobStatus, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, uint32_t nLayerCount, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
 {
-    return std::shared_ptr<CBuildJob>(make(sUUID, sName, eJobStatus, sTimeStamp, sStorageStreamUUID, sUserID, pSQLHandler, pStoragePath));
+    return std::shared_ptr<CBuildJob>(make(sUUID, sName, eJobStatus, sTimeStamp, sStorageStreamUUID, sUserID, nLayerCount, pSQLHandler, pStoragePath));
 }
 
 PBuildJob CBuildJob::makeSharedFromDatabase(const std::string& sJobUUID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
@@ -107,6 +120,14 @@ PBuildJob CBuildJob::makeSharedFromDatabase(const std::string& sJobUUID, AMCData
     return std::shared_ptr<CBuildJob>(makeFromDatabase (sJobUUID, pSQLHandler, pStoragePath));
 }
 
+PBuildJob CBuildJob::makeSharedFrom(CBuildJob* pBuildJob)
+{
+    if (pBuildJob == nullptr)
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
+
+    return std::shared_ptr<CBuildJob>(makeFrom (pBuildJob));
+}
+
 
 std::string CBuildJob::GetUUID()
 {
@@ -118,6 +139,12 @@ std::string CBuildJob::GetName()
     return m_sName;
 }
 
+LibMCData_uint32 CBuildJob::GetLayerCount()
+{
+    return m_nLayerCount;
+}
+
+
 LibMCData::eBuildJobStatus CBuildJob::GetStatus()
 {
     return m_eJobStatus;
@@ -133,11 +160,178 @@ IStorageStream * CBuildJob::GetStorageStream()
     return CStorageStream::makeFromDatabase(m_sStorageStreamUUID, m_pSQLHandler, m_pStoragePath);
 }
 
+std::string CBuildJob::GetStorageStreamUUID()
+{
+    return m_sStorageStreamUUID;
+}
+
 ILogSession * CBuildJob::GetBuildJobLogger()
 {
 	throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_NOTIMPLEMENTED);
 }
 
+void CBuildJob::ensureUpdate(const std::string sUpdateUUID, uint32_t nErrorCode)
+{
+    std::string sSelectQuery = "SELECT uuid FROM buildjobs WHERE updateuuid=?";
+    auto pSelectStatement = m_pSQLHandler->prepareStatement(sSelectQuery);
+    pSelectStatement->setString(1, sUpdateUUID);
+    if (!pSelectStatement->nextRow())
+        throw ELibMCDataInterfaceException(nErrorCode);
+
+}
+
+void CBuildJob::StartValidating()
+{
+
+    auto updateUUID = AMCCommon::CUtils::createUUID();
+    std::string sQuery = "UPDATE buildjobs SET status=?, updateuuid=? WHERE status=? AND uuid=?";
+    auto pStatement = m_pSQLHandler->prepareStatement(sQuery);
+    pStatement->setString(1, convertBuildJobStatusToString(LibMCData::eBuildJobStatus::Validating));
+    pStatement->setString(2, updateUUID);
+    pStatement->setString(3, convertBuildJobStatusToString(LibMCData::eBuildJobStatus::Created));
+    pStatement->setString(4, m_sUUID);
+    pStatement->execute();
+
+    ensureUpdate(updateUUID, LIBMCDATA_ERROR_COULDNOTUPDATEBUILDSTATUS);
+}
+
+void CBuildJob::FinishValidating(const LibMCData_uint32 nLayerCount)
+{
+
+    auto updateUUID = AMCCommon::CUtils::createUUID();
+    std::string sQuery = "UPDATE buildjobs SET status=?, layercount=?, updateuuid=? WHERE status=? AND uuid=?";
+    auto pStatement = m_pSQLHandler->prepareStatement(sQuery);
+    pStatement->setString(1, convertBuildJobStatusToString(LibMCData::eBuildJobStatus::Validated));
+    pStatement->setInt64(2, nLayerCount);
+    pStatement->setString(3, updateUUID);
+    pStatement->setString(4, convertBuildJobStatusToString(LibMCData::eBuildJobStatus::Validating));
+    pStatement->setString(5, m_sUUID);
+    pStatement->execute();
+
+    ensureUpdate(updateUUID, LIBMCDATA_ERROR_COULDNOTUPDATEBUILDSTATUS);
+}
+
+
+void CBuildJob::ArchiveJob()
+{
+    auto updateUUID = AMCCommon::CUtils::createUUID();
+    std::string sQuery = "UPDATE buildjobs SET status=?, updateuuid=? WHERE status=? AND uuid=?";
+    auto pStatement = m_pSQLHandler->prepareStatement(sQuery);
+    pStatement->setString(1, convertBuildJobStatusToString(LibMCData::eBuildJobStatus::Archived));
+    pStatement->setString(2, updateUUID);
+    pStatement->setString(3, convertBuildJobStatusToString(LibMCData::eBuildJobStatus::Validated));
+    pStatement->setString(4, m_sUUID);
+    pStatement->execute();
+
+    ensureUpdate(updateUUID, LIBMCDATA_ERROR_COULDNOTUPDATEBUILDSTATUS);
+}
+
+
+void CBuildJob::UnArchiveJob()
+{
+    auto updateUUID = AMCCommon::CUtils::createUUID();
+    std::string sQuery = "UPDATE buildjobs SET status=?, updateuuid=? WHERE status=? AND uuid=?";
+    auto pStatement = m_pSQLHandler->prepareStatement(sQuery);
+    pStatement->setString(1, convertBuildJobStatusToString(LibMCData::eBuildJobStatus::Validated));
+    pStatement->setString(2, updateUUID);
+    pStatement->setString(3, convertBuildJobStatusToString(LibMCData::eBuildJobStatus::Archived));
+    pStatement->setString(4, m_sUUID);
+    pStatement->execute();
+
+    ensureUpdate(updateUUID, LIBMCDATA_ERROR_COULDNOTUPDATEBUILDSTATUS);
+
+}
+
+void CBuildJob::DeleteJob()
+{
+    // TODO: Physically delete job from disk!
+
+    auto updateUUID = AMCCommon::CUtils::createUUID();
+    std::string sQuery = "UPDATE buildjobs SET status=?, updateuuid=? WHERE status=? AND uuid=?";
+    auto pStatement = m_pSQLHandler->prepareStatement(sQuery);
+    pStatement->setString(1, convertBuildJobStatusToString(LibMCData::eBuildJobStatus::Deleted));
+    pStatement->setString(2, updateUUID);
+    pStatement->setString(3, convertBuildJobStatusToString(LibMCData::eBuildJobStatus::Archived));
+    pStatement->setString(4, m_sUUID);
+    pStatement->execute();
+
+    ensureUpdate(updateUUID, LIBMCDATA_ERROR_COULDNOTUPDATEBUILDSTATUS);
+
+}
+
+bool CBuildJob::JobCanBeArchived()
+
+{
+    // TODO: Track active jobs and prevent them from archiving.
+    std::string sQuery = "SELECT uuid FROM buildjobs WHERE status=? AND uuid=?";
+    auto pStatement = m_pSQLHandler->prepareStatement(sQuery);
+    pStatement->setString(1, convertBuildJobStatusToString(LibMCData::eBuildJobStatus::Validated));
+    pStatement->setString(2, m_sUUID);
+    return pStatement->nextRow();
+
+}
+
+void CBuildJob::AddJobData(const std::string& sName, IStorageStream* pStream, const LibMCData::eBuildJobDataType eDataType, const std::string& sUserID)
+{
+    if (pStream == nullptr)
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
+
+    auto sStreamUUID = pStream->GetUUID();
+
+    auto sTimeStamp = AMCCommon::CUtils::getCurrentISO8601TimeUTC();
+    std::unique_ptr<CBuildJobData> buildJobData (CBuildJobData::createInDatabase (sName, m_sUUID, eDataType, sTimeStamp, sStreamUUID, sUserID, m_pSQLHandler, m_pStoragePath));
+}
+
+
+IBuildJobDataIterator* CBuildJob::ListJobDataEx(AMCData::CSQLStatement* pStatement)
+{
+    if (pStatement == nullptr)
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
+
+    std::unique_ptr<CBuildJobDataIterator> buildJobIterator(new CBuildJobDataIterator());
+
+    while (pStatement->nextRow()) {
+        std::string sDataUUID = pStatement->getColumnUUID(1);
+        std::string sJobUUID = pStatement->getColumnString(2);
+        std::string sName = pStatement->getColumnString(3);
+        LibMCData::eBuildJobDataType eDataType = CBuildJobData::convertStringToBuildJobDataType(pStatement->getColumnString(4));
+        std::string sTimeStamp = pStatement->getColumnString(5);
+        std::string sStorageStreamUUID = pStatement->getColumnUUID(6);
+        std::string sUserID = pStatement->getColumnString(7);
+
+
+        buildJobIterator->AddJobData(CBuildJobData::makeShared(sDataUUID, sName, sJobUUID, eDataType, sTimeStamp, sStorageStreamUUID, sUserID, m_pSQLHandler, m_pStoragePath));
+    }
+
+    return buildJobIterator.release();
+}
+
+
+IBuildJobDataIterator* CBuildJob::ListJobDataByType(const LibMCData::eBuildJobDataType eDataType)
+{
+
+    std::string sQuery = "SELECT uuid, jobuuid, name, datatype, timestamp, storagestreamuuid, userid FROM buildjobdata WHERE jobuuid=? AND active=? AND datatype=? ORDER BY timestamp";
+    auto pStatement = m_pSQLHandler->prepareStatement(sQuery);
+    pStatement->setString (1, m_sUUID);
+    pStatement->setInt(2, 1);
+    pStatement->setString(3, CBuildJobData::convertBuildJobDataTypeToString(eDataType));
+
+    return ListJobDataEx (pStatement.get());
+}
+
+IBuildJobDataIterator* CBuildJob::ListJobData()
+{
+    std::unique_ptr<CBuildJobDataIterator> buildJobIterator (new CBuildJobDataIterator ());
+
+    std::string sQuery = "SELECT uuid, jobuuid, name, datatype, timestamp, storagestreamuuid, userid FROM buildjobdata WHERE jobuuid=? AND active=? ORDER BY timestamp";
+    auto pStatement = m_pSQLHandler->prepareStatement(sQuery);
+    pStatement->setString(1, m_sUUID);
+    pStatement->setInt(2, 1);
+
+    return ListJobDataEx(pStatement.get());
+}
+
+
 std::string CBuildJob::convertBuildJobStatusToString(const LibMCData::eBuildJobStatus eStatus)
 {
     switch (eStatus) {
@@ -145,6 +339,7 @@ std::string CBuildJob::convertBuildJobStatusToString(const LibMCData::eBuildJobS
     case LibMCData::eBuildJobStatus::Validating: return "validating";
     case LibMCData::eBuildJobStatus::Validated: return "validated";
     case LibMCData::eBuildJobStatus::Archived: return "archived";
+    case LibMCData::eBuildJobStatus::Deleted: return "deleted";
     default:
         throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDJOBSTATUS);
     }
@@ -160,6 +355,9 @@ LibMCData::eBuildJobStatus CBuildJob::convertStringToBuildJobStatus(const std::s
         return LibMCData::eBuildJobStatus::Validated;
     if (sValue == "archived")
         return LibMCData::eBuildJobStatus::Archived;
+    if (sValue == "deleted")
+        return LibMCData::eBuildJobStatus::Deleted;
 
     throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDJOBSTATUS);
 }
+
diff --git a/Implementation/LibMCData/libmcdata_buildjob.hpp b/Implementation/LibMCData/libmcdata_buildjob.hpp
index 59f10de9..0b584a67 100644
--- a/Implementation/LibMCData/libmcdata_buildjob.hpp
+++ b/Implementation/LibMCData/libmcdata_buildjob.hpp
@@ -69,32 +69,61 @@ class CBuildJob : public virtual IBuildJob, public virtual CBase {
     std::string m_sTimeStamp;
     std::string m_sStorageStreamUUID;
     std::string m_sUserID;
+    uint32_t m_nLayerCount;
     AMCData::PStoragePath m_pStoragePath;
     AMCData::PSQLHandler m_pSQLHandler;
 
+    void ensureUpdate (const std::string sUpdateUUID, uint32_t nErrorCode);
+
+    IBuildJobDataIterator* ListJobDataEx (AMCData::CSQLStatement * pStatement); 
+
 protected:
 
-    CBuildJob(const std::string& sUUID, const std::string sName, LibMCData::eBuildJobStatus eJobStatus, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
+    CBuildJob(const std::string& sUUID, const std::string sName, LibMCData::eBuildJobStatus eJobStatus, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, uint32_t nLayerCount, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
 
 public:
 
-    static CBuildJob* make(const std::string& sUUID, const std::string sName, LibMCData::eBuildJobStatus eJobStatus, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
+    static CBuildJob* make(const std::string& sUUID, const std::string sName, LibMCData::eBuildJobStatus eJobStatus, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, uint32_t nLayerCount, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
     static CBuildJob* makeFromDatabase(const std::string& sJobUUID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
+    static CBuildJob* makeFrom(CBuildJob* pBuildJob);
 
-    static PBuildJob makeShared(const std::string& sUUID, const std::string sName, LibMCData::eBuildJobStatus eJobStatus, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
+    static PBuildJob makeShared(const std::string& sUUID, const std::string sName, LibMCData::eBuildJobStatus eJobStatus, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, uint32_t nLayerCount, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
     static PBuildJob makeSharedFromDatabase(const std::string& sJobUUID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
+    static PBuildJob makeSharedFrom(CBuildJob* pBuildJob);
 
     std::string GetUUID() override;
 
 	std::string GetName() override;
 
+    LibMCData_uint32 GetLayerCount() override;
+
 	LibMCData::eBuildJobStatus GetStatus() override;
 
 	std::string GetTimeStamp() override;
 
 	IStorageStream * GetStorageStream() override;
 
-	ILogSession * GetBuildJobLogger() override;
+    std::string GetStorageStreamUUID() override;
+
+    ILogSession * GetBuildJobLogger() override;
+
+    void StartValidating() override;
+
+    void FinishValidating(const LibMCData_uint32 nLayerCount) override;
+
+    void ArchiveJob() override;
+
+    void UnArchiveJob() override;
+
+    void DeleteJob() override;
+    
+    bool JobCanBeArchived() override;
+
+    void AddJobData(const std::string& sName, IStorageStream* pStream, const LibMCData::eBuildJobDataType eDataType, const std::string& sUserID) override;
+
+    IBuildJobDataIterator* ListJobDataByType(const LibMCData::eBuildJobDataType eDataType) override;
+
+    IBuildJobDataIterator* ListJobData() override;
 
     static std::string convertBuildJobStatusToString(const LibMCData::eBuildJobStatus eStatus);
     static LibMCData::eBuildJobStatus convertStringToBuildJobStatus(const std::string& sValue);
diff --git a/Implementation/LibMCData/libmcdata_buildjobdata.cpp b/Implementation/LibMCData/libmcdata_buildjobdata.cpp
new file mode 100644
index 00000000..d436467b
--- /dev/null
+++ b/Implementation/LibMCData/libmcdata_buildjobdata.cpp
@@ -0,0 +1,187 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CBuildJobData
+
+*/
+
+#include "libmcdata_buildjobdata.hpp"
+#include "libmcdata_interfaceexception.hpp"
+#include "libmcdata_storagestream.hpp"
+
+// Include custom headers here.
+#include "common_utils.hpp"
+
+using namespace LibMCData::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CBuildJobData 
+**************************************************************************************************************************/
+
+CBuildJobData::CBuildJobData(const std::string& sDataUUID, const std::string& sName, const std::string& sJobUUID, LibMCData::eBuildJobDataType eDataType, std::string& sTimeStamp, std::string& sStorageStreamUUID, std::string& sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
+    : 
+    m_sName(sName),
+    m_eDataType(eDataType),
+    m_sDataUUID(AMCCommon::CUtils::normalizeUUIDString(sDataUUID)),
+    m_sTimeStamp(sTimeStamp),
+    m_sJobUUID(AMCCommon::CUtils::normalizeUUIDString(sJobUUID)),
+    m_sStorageStreamUUID(AMCCommon::CUtils::normalizeUUIDString(sStorageStreamUUID)),
+    m_sUserID(sUserID),
+    m_pSQLHandler(pSQLHandler),
+    m_pStoragePath(pStoragePath)
+{
+    if (pSQLHandler.get() == nullptr)
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
+    if (pStoragePath.get() == nullptr)
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
+    if (sName.empty())
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDJOBNAME);
+    if (sTimeStamp.empty())
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDJOBTIMESTAMP);
+    if (sUserID.empty())
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDUSERID);
+}
+
+CBuildJobData::~CBuildJobData()
+{
+
+}
+
+CBuildJobData* CBuildJobData::make(const std::string& sDataUUID, const std::string& sName, const std::string& sJobUUID, LibMCData::eBuildJobDataType eDataType, std::string& sTimeStamp, std::string& sStorageStreamUUID, std::string& sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
+{
+    return new CBuildJobData(sDataUUID, sName, sJobUUID, eDataType, sTimeStamp, sStorageStreamUUID, sUserID, pSQLHandler, pStoragePath);
+}
+
+CBuildJobData* CBuildJobData::makeFrom(CBuildJobData* pBuildJob)
+{
+    if (pBuildJob == nullptr)
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
+
+    return make(pBuildJob->m_sDataUUID, pBuildJob->m_sName, pBuildJob->m_sJobUUID, pBuildJob->m_eDataType, pBuildJob->m_sTimeStamp, pBuildJob->m_sStorageStreamUUID, pBuildJob->m_sUserID, pBuildJob->m_pSQLHandler, pBuildJob->m_pStoragePath);
+}
+
+PBuildJobData CBuildJobData::makeShared(const std::string& sDataUUID, const std::string& sName, const std::string& sJobUUID, LibMCData::eBuildJobDataType eDataType, std::string& sTimeStamp, std::string& sStorageStreamUUID, std::string& sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
+{
+    return std::shared_ptr<CBuildJobData>(make(sDataUUID, sName, sJobUUID, eDataType, sTimeStamp, sStorageStreamUUID, sUserID, pSQLHandler, pStoragePath));
+}
+
+PBuildJobData CBuildJobData::makeSharedFrom(CBuildJobData* pBuildJobData)
+{
+    return std::shared_ptr<CBuildJobData> (makeFrom (pBuildJobData));
+}
+
+CBuildJobData* CBuildJobData::createInDatabase(const std::string sName, const std::string & sJobUUID, LibMCData::eBuildJobDataType eDataType, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
+{
+    if (pSQLHandler.get() == nullptr)
+        throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+
+    std::string sUUID = AMCCommon::CUtils::createUUID ();
+
+    std::string sInsertQuery = "INSERT INTO buildjobdata (uuid, jobuuid, name, datatype, timestamp, storagestreamuuid, userid, active) VALUES (?, ?, ?, ?, ?, ?, ?, 1)";
+    auto pInsertStatement = pSQLHandler->prepareStatement(sInsertQuery);
+    pInsertStatement->setString(1, sUUID);
+    pInsertStatement->setString(2, sJobUUID);
+    pInsertStatement->setString(3, sName);
+    pInsertStatement->setString(4, CBuildJobData::convertBuildJobDataTypeToString(eDataType));
+    pInsertStatement->setString(5, sTimeStamp);
+    pInsertStatement->setString(6, sStorageStreamUUID);
+    pInsertStatement->setString(7, sUserID);
+    pInsertStatement->execute();
+
+    return make(sUUID, sName, sJobUUID, eDataType, sTimeStamp, sStorageStreamUUID, sUserID, pSQLHandler, pStoragePath);
+}
+
+PBuildJobData CBuildJobData::createSharedInDatabase(const std::string sName, const std::string & sJobUUID, LibMCData::eBuildJobDataType eDataType, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
+{
+    return std::shared_ptr<CBuildJobData>(createInDatabase(sName, sJobUUID, eDataType, sTimeStamp, sStorageStreamUUID, sUserID, pSQLHandler, pStoragePath));
+}
+
+
+std::string CBuildJobData::GetName()
+{
+    return m_sName;
+}
+
+std::string CBuildJobData::GetTimeStamp()
+{
+    return m_sTimeStamp;
+}
+
+IStorageStream * CBuildJobData::GetStorageStream()
+{
+	return CStorageStream::makeFromDatabase(m_sStorageStreamUUID, m_pSQLHandler, m_pStoragePath);
+}
+
+LibMCData::eBuildJobDataType CBuildJobData::GetDataType()
+{
+    return m_eDataType;
+}
+
+std::string CBuildJobData::GetMIMEType()
+{
+    auto pStorageStream = CStorageStream::makeSharedFromDatabase(m_sStorageStreamUUID, m_pSQLHandler, m_pStoragePath);
+    return pStorageStream->GetMIMEType();
+}
+
+std::string CBuildJobData::convertBuildJobDataTypeToString(const LibMCData::eBuildJobDataType dataType)
+{
+    switch (dataType) {
+    case LibMCData::eBuildJobDataType::Unknown: return "unknown";
+    case LibMCData::eBuildJobDataType::Toolpath: return "toolpath";
+    case LibMCData::eBuildJobDataType::Timeline: return "timeline";
+    case LibMCData::eBuildJobDataType::CustomBinaryData: return "custombinarydata";
+    case LibMCData::eBuildJobDataType::PNGImage: return "pngimage";
+    case LibMCData::eBuildJobDataType::JPEGImage: return "jpegimage";
+    case LibMCData::eBuildJobDataType::Thumbnail: return "thumbnail";
+    default:
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDDATATYPE);
+    }
+}
+
+LibMCData::eBuildJobDataType CBuildJobData::convertStringToBuildJobDataType(const std::string& sValue)
+{
+    if (sValue == "unknown")
+        return LibMCData::eBuildJobDataType::Unknown;
+    if (sValue == "toolpath")
+        return LibMCData::eBuildJobDataType::Toolpath;
+    if (sValue == "timeline")
+        return LibMCData::eBuildJobDataType::Timeline;
+    if (sValue == "custombinarydata")
+        return LibMCData::eBuildJobDataType::CustomBinaryData;
+    if (sValue == "pngimage")
+        return LibMCData::eBuildJobDataType::PNGImage;
+    if (sValue == "jpegimage")
+        return LibMCData::eBuildJobDataType::JPEGImage;
+    if (sValue == "thumbnail")
+        return LibMCData::eBuildJobDataType::Thumbnail;
+
+    throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDDATATYPE);
+
+}
+
diff --git a/Implementation/LibMCData/libmcdata_buildjobdata.hpp b/Implementation/LibMCData/libmcdata_buildjobdata.hpp
new file mode 100644
index 00000000..1dc951e5
--- /dev/null
+++ b/Implementation/LibMCData/libmcdata_buildjobdata.hpp
@@ -0,0 +1,114 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CBuildJobData
+
+*/
+
+
+#ifndef __LIBMCDATA_BUILDJOBDATA
+#define __LIBMCDATA_BUILDJOBDATA
+
+#include "libmcdata_interfaces.hpp"
+
+// Parent classes
+#include "libmcdata_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+#include "amcdata_storagepath.hpp"
+#include "amcdata_sqlhandler.hpp"
+
+namespace LibMCData {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CBuildJobData 
+**************************************************************************************************************************/
+
+class CBuildJobData;
+
+typedef std::shared_ptr<CBuildJobData> PBuildJobData;
+
+class CBuildJobData : public virtual IBuildJobData, public virtual CBase {
+private:
+
+    std::string m_sDataUUID;
+    std::string m_sName;
+    LibMCData::eBuildJobDataType m_eDataType;
+    std::string m_sTimeStamp;
+    std::string m_sStorageStreamUUID;
+    std::string m_sUserID;
+    std::string m_sJobUUID;
+    AMCData::PSQLHandler m_pSQLHandler;
+    AMCData::PStoragePath m_pStoragePath;
+
+protected:
+
+    CBuildJobData(const std::string& sDataUUID, const std::string & sName, const std::string& sJobUUID, LibMCData::eBuildJobDataType eDataType, std::string & sTimeStamp, std::string & sStorageStreamUUID, std::string & sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
+
+public:
+
+    ~CBuildJobData();
+
+    static CBuildJobData* make(const std::string& sDataUUID, const std::string& sName, const std::string& sJobUUID, LibMCData::eBuildJobDataType eDataType, std::string& sTimeStamp, std::string& sStorageStreamUUID, std::string& sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
+    static CBuildJobData* makeFrom(CBuildJobData* pBuildJob);
+
+    static PBuildJobData makeShared(const std::string& sDataUUID, const std::string& sName, const std::string& sJobUUID, LibMCData::eBuildJobDataType eDataType, std::string& sTimeStamp, std::string& sStorageStreamUUID, std::string& sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
+    static PBuildJobData makeSharedFrom(CBuildJobData* pBuildJobData);    
+
+    static CBuildJobData* createInDatabase(const std::string sName, const std::string & sJobUUID, LibMCData::eBuildJobDataType eDataType, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
+    static PBuildJobData createSharedInDatabase(const std::string sName, const std::string & sJobUUID, LibMCData::eBuildJobDataType eDataType, std::string sTimeStamp, std::string sStorageStreamUUID, std::string sUserID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
+
+	std::string GetName() override;
+
+	std::string GetTimeStamp() override;
+
+	IStorageStream * GetStorageStream() override;
+
+	LibMCData::eBuildJobDataType GetDataType() override;
+
+	std::string GetMIMEType() override;
+
+    static std::string convertBuildJobDataTypeToString(const LibMCData::eBuildJobDataType dataType);
+    static LibMCData::eBuildJobDataType convertStringToBuildJobDataType(const std::string& sValue);
+
+};
+
+} // namespace Impl
+} // namespace LibMCData
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBMCDATA_BUILDJOBDATA
diff --git a/Implementation/LibMCData/libmcdata_buildjobdataiterator.cpp b/Implementation/LibMCData/libmcdata_buildjobdataiterator.cpp
new file mode 100644
index 00000000..263ed73b
--- /dev/null
+++ b/Implementation/LibMCData/libmcdata_buildjobdataiterator.cpp
@@ -0,0 +1,89 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CBuildJobDataIterator
+
+*/
+
+#include "libmcdata_buildjobdataiterator.hpp"
+#include "libmcdata_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibMCData::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CBuildJobDataIterator 
+**************************************************************************************************************************/
+CBuildJobDataIterator::CBuildJobDataIterator()
+    : CIterator ()
+{
+
+}
+
+IBase* CBuildJobDataIterator::GetCurrent()
+{
+    return GetCurrentJobData();
+}
+
+IBuildJobData* CBuildJobDataIterator::GetCurrentJobData()
+{
+    if ((m_nCurrentIndex < 0) || (m_nCurrentIndex >= m_List.size()))
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDITERATOR);
+
+    auto pBuildJobData = std::dynamic_pointer_cast<CBuildJobData> (m_List[m_nCurrentIndex]);
+    if (pBuildJobData.get() == nullptr)
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+
+    return CBuildJobData::makeFrom(pBuildJobData.get());
+}
+
+IIterator* CBuildJobDataIterator::Clone()
+{
+    std::unique_ptr<CBuildJobDataIterator> pNewIterator(new CBuildJobDataIterator());
+
+    for (auto pBase : m_List) {
+        auto pBuildJobData = std::dynamic_pointer_cast<CBuildJobData> (pBase);
+        if (pBuildJobData.get() == nullptr)
+            throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+        pNewIterator->AddJobData(pBuildJobData);
+    }
+
+    return pNewIterator.release();
+}
+
+void CBuildJobDataIterator::AddJobData(std::shared_ptr<CBuildJobData> pBuildJobData)
+{
+    if (pBuildJobData.get() == nullptr)
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
+
+    m_List.push_back(pBuildJobData);
+}
+
diff --git a/Implementation/LibMCData/libmcdata_buildjobdataiterator.hpp b/Implementation/LibMCData/libmcdata_buildjobdataiterator.hpp
new file mode 100644
index 00000000..09b6ed78
--- /dev/null
+++ b/Implementation/LibMCData/libmcdata_buildjobdataiterator.hpp
@@ -0,0 +1,84 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CBuildJobDataIterator
+
+*/
+
+
+#ifndef __LIBMCDATA_BUILDJOBDATAITERATOR
+#define __LIBMCDATA_BUILDJOBDATAITERATOR
+
+#include "libmcdata_interfaces.hpp"
+
+// Parent classes
+#include "libmcdata_iterator.hpp"
+#include "libmcdata_buildjobdata.hpp"
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibMCData {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CBuildJobDataIterator 
+**************************************************************************************************************************/
+
+class CBuildJobDataIterator : public virtual IBuildJobDataIterator, public virtual CIterator {
+private:
+
+protected:
+
+public:
+    CBuildJobDataIterator();
+
+    IBase* GetCurrent() override;
+
+    IBuildJobData* GetCurrentJobData() override;
+
+    IIterator* Clone() override;
+
+    void AddJobData(std::shared_ptr<CBuildJobData> pBuildJobData);
+
+};
+
+} // namespace Impl
+} // namespace LibMCData
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBMCDATA_BUILDJOBDATAITERATOR
diff --git a/Implementation/LibMCData/libmcdata_buildjobhandler.cpp b/Implementation/LibMCData/libmcdata_buildjobhandler.cpp
index 033a7e69..20755290 100644
--- a/Implementation/LibMCData/libmcdata_buildjobhandler.cpp
+++ b/Implementation/LibMCData/libmcdata_buildjobhandler.cpp
@@ -57,23 +57,15 @@ CBuildJobHandler::CBuildJobHandler(AMCData::PSQLHandler pSQLHandler, AMCData::PS
 
 }
 
-IBuildJob* CBuildJobHandler::CreateJob(const std::string& sJobUUID, const std::string& sName, const std::string& sUserID, IStorageStream* pStreamInstance) 
+IBuildJob* CBuildJobHandler::CreateJob(const std::string& sJobUUID, const std::string& sName, const std::string& sUserID, const std::string& sStorageStreamUUID)
 {
     auto sParsedJobUUID = AMCCommon::CUtils::normalizeUUIDString(sJobUUID);
 
-    if (pStreamInstance == nullptr)
-        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
     if ((sName.length() == 0) || (sName.length() >= 255))
         throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
     if ((sUserID.length() == 0) || (sUserID.length() >= 63))
         throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
 
-    std::string sStorageStreamUUID = AMCCommon::CUtils::normalizeUUIDString(pStreamInstance->GetUUID());
-    std::string sStorageStreamContextUUID = AMCCommon::CUtils::normalizeUUIDString(pStreamInstance->GetContextUUID());
-
-    if (sStorageStreamContextUUID != sParsedJobUUID)
-        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDSTREAMCONTEXT);
-
     std::string sQuery = "SELECT uuid FROM buildjobs WHERE uuid=?";    
     auto pStatement = m_pSQLHandler->prepareStatement(sQuery);
     pStatement->setString (1, sParsedJobUUID);
@@ -94,7 +86,7 @@ IBuildJob* CBuildJobHandler::CreateJob(const std::string& sJobUUID, const std::s
     pInsertStatement->setString(6, sUserID);
     pInsertStatement->execute();
 
-    return CBuildJob::make(sParsedJobUUID, sName, eJobStatus, sTimeStamp, sStorageStreamUUID, sUserID, m_pSQLHandler, m_pStoragePath);
+    return CBuildJob::make(sParsedJobUUID, sName, eJobStatus, sTimeStamp, sStorageStreamUUID, sUserID, 0, m_pSQLHandler, m_pStoragePath);
     
 }
 
@@ -108,7 +100,7 @@ IBuildJobIterator* CBuildJobHandler::ListJobsByStatus(const LibMCData::eBuildJob
 
     std::unique_ptr<CBuildJobIterator> pJobIterator(new CBuildJobIterator());
 
-    std::string sQuery = "SELECT uuid, name, status, timestamp, storagestreamuuid, userid FROM buildjobs WHERE status=? ORDER BY timestamp DESC";
+    std::string sQuery = "SELECT uuid, name, status, timestamp, storagestreamuuid, layercount, userid FROM buildjobs WHERE status=? ORDER BY timestamp DESC";
     auto pStatement = m_pSQLHandler->prepareStatement(sQuery);
     pStatement->setString(1, CBuildJob::convertBuildJobStatusToString(eStatus));
     while (pStatement->nextRow()) {
@@ -118,9 +110,10 @@ IBuildJobIterator* CBuildJobHandler::ListJobsByStatus(const LibMCData::eBuildJob
         auto eJobStatus = CBuildJob::convertStringToBuildJobStatus(pStatement->getColumnString(3));
         auto sTimeStamp = pStatement->getColumnString(4);
         auto sStorageStreamUUID = pStatement->getColumnString(5);
-        auto sUserID = pStatement->getColumnString(6);
+        auto nLayerCount = pStatement->getColumnInt(6);
+        auto sUserID = pStatement->getColumnString(7);
     
-        pJobIterator->AddJob (CBuildJob::makeShared (sUUID, sName, eJobStatus, sTimeStamp, sStorageStreamUUID, sUserID, m_pSQLHandler, m_pStoragePath));
+        pJobIterator->AddJob (CBuildJob::makeShared (sUUID, sName, eJobStatus, sTimeStamp, sStorageStreamUUID, sUserID, nLayerCount, m_pSQLHandler, m_pStoragePath));
     }
 
     return pJobIterator.release();
diff --git a/Implementation/LibMCData/libmcdata_buildjobhandler.hpp b/Implementation/LibMCData/libmcdata_buildjobhandler.hpp
index f6a6b5fc..035d48f5 100644
--- a/Implementation/LibMCData/libmcdata_buildjobhandler.hpp
+++ b/Implementation/LibMCData/libmcdata_buildjobhandler.hpp
@@ -78,7 +78,7 @@ class CBuildJobHandler : public virtual IBuildJobHandler, public virtual CBase {
 
     CBuildJobHandler(AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
 
-    IBuildJob* CreateJob(const std::string& sJobUUID, const std::string& sName, const std::string& sUserID, IStorageStream* pStreamInstance) override;
+    IBuildJob* CreateJob(const std::string& sJobUUID, const std::string& sName, const std::string& sUserID, const std::string& sStorageStreamUUID) override;
 
 	IBuildJob * RetrieveJob(const std::string & sJobUUID) override;
 
diff --git a/Implementation/LibMCData/libmcdata_buildjobiterator.cpp b/Implementation/LibMCData/libmcdata_buildjobiterator.cpp
index bad5c0a4..c559ce1f 100644
--- a/Implementation/LibMCData/libmcdata_buildjobiterator.cpp
+++ b/Implementation/LibMCData/libmcdata_buildjobiterator.cpp
@@ -32,6 +32,7 @@ Abstract: This is a stub class definition of CBuildJobIterator
 */
 
 #include "libmcdata_buildjobiterator.hpp"
+#include "libmcdata_buildjob.hpp"
 #include "libmcdata_interfaceexception.hpp"
 
 // Include custom headers here.
@@ -44,6 +45,7 @@ using namespace LibMCData::Impl;
 **************************************************************************************************************************/
 
 CBuildJobIterator::CBuildJobIterator()
+    : CIterator()
 {
 }
 
@@ -52,11 +54,38 @@ void CBuildJobIterator::AddJob(std::shared_ptr<CBuildJob> pBuildJob)
 {
     if (pBuildJob.get() == nullptr)
         throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
+
+    m_List.push_back(pBuildJob);
 }
 
+IBase* CBuildJobIterator::GetCurrent()
+{
+    return GetCurrentJob();
+}
 
 IBuildJob * CBuildJobIterator::GetCurrentJob()
 {
-	throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_NOTIMPLEMENTED);
+    if ((m_nCurrentIndex < 0) || (m_nCurrentIndex >= m_List.size()))
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDITERATOR);
+
+    auto pBuildJob = std::dynamic_pointer_cast<CBuildJob> (m_List[m_nCurrentIndex]);
+    if (pBuildJob.get() == nullptr)
+        throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+
+    return CBuildJob::makeFrom (pBuildJob.get());
 }
 
+IIterator* CBuildJobIterator::Clone()
+{
+    std::unique_ptr<CBuildJobIterator> pNewIterator (new CBuildJobIterator ());
+
+    for (auto pBase : m_List) {
+        auto pBuildJob = std::dynamic_pointer_cast<CBuildJob> (pBase);
+        if (pBuildJob.get() == nullptr)
+            throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+        pNewIterator->AddJob(pBuildJob);
+    }
+
+    return pNewIterator.release();
+
+}
diff --git a/Implementation/LibMCData/libmcdata_buildjobiterator.hpp b/Implementation/LibMCData/libmcdata_buildjobiterator.hpp
index 076f2e9b..ffdf85cf 100644
--- a/Implementation/LibMCData/libmcdata_buildjobiterator.hpp
+++ b/Implementation/LibMCData/libmcdata_buildjobiterator.hpp
@@ -65,7 +65,11 @@ class CBuildJobIterator : public virtual IBuildJobIterator, public virtual CIter
 
     CBuildJobIterator();
 
-	IBuildJob * GetCurrentJob() override;
+    IBase* GetCurrent() override;
+
+    IBuildJob * GetCurrentJob() override;
+
+    IIterator* Clone() override;
 
     void AddJob(std::shared_ptr<CBuildJob> pBuildJob);
 
diff --git a/Implementation/LibMCData/libmcdata_iterator.cpp b/Implementation/LibMCData/libmcdata_iterator.cpp
index 0c89a862..d17c8feb 100644
--- a/Implementation/LibMCData/libmcdata_iterator.cpp
+++ b/Implementation/LibMCData/libmcdata_iterator.cpp
@@ -43,28 +43,38 @@ using namespace LibMCData::Impl;
  Class definition of CIterator 
 **************************************************************************************************************************/
 
-bool CIterator::MoveNext()
-{
-	throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_NOTIMPLEMENTED);
-}
 
-bool CIterator::MovePrevious()
+CIterator::CIterator()
+    : m_nCurrentIndex (-1)
 {
-	throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_NOTIMPLEMENTED);
+    
 }
 
-IBase * CIterator::GetCurrent()
+
+bool CIterator::MoveNext()
 {
-	throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_NOTIMPLEMENTED);
+    if (((size_t)m_nCurrentIndex + 1) < m_List.size()) {
+        m_nCurrentIndex++;
+        return true;
+    }
+    else
+        return false;
 }
 
-IIterator * CIterator::Clone()
+bool CIterator::MovePrevious()
 {
-	throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_NOTIMPLEMENTED);
+    if (m_nCurrentIndex > 0) {
+        m_nCurrentIndex--;
+        return true;
+    }
+    else
+        return false;
+
 }
 
+
 LibMCData_uint64 CIterator::Count()
 {
-	throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_NOTIMPLEMENTED);
+    return m_List.size ();
 }
 
diff --git a/Implementation/LibMCData/libmcdata_iterator.hpp b/Implementation/LibMCData/libmcdata_iterator.hpp
index d9669a22..eb623471 100644
--- a/Implementation/LibMCData/libmcdata_iterator.hpp
+++ b/Implementation/LibMCData/libmcdata_iterator.hpp
@@ -45,7 +45,7 @@ Abstract: This is the class declaration of CIterator
 #endif
 
 // Include custom headers here.
-
+#include <vector>
 
 namespace LibMCData {
 namespace Impl {
@@ -58,35 +58,21 @@ namespace Impl {
 class CIterator : public virtual IIterator, public virtual CBase {
 private:
 
-	/**
-	* Put private members here.
-	*/
-
 protected:
 
-	/**
-	* Put protected members here.
-	*/
+    std::vector<std::shared_ptr<CBase>> m_List;
 
-public:
+    int32_t m_nCurrentIndex;
 
-	/**
-	* Put additional public members here. They will not be visible in the external API.
-	*/
 
+public:
 
-	/**
-	* Public member functions to implement.
-	*/
+    CIterator();
 
 	bool MoveNext() override;
 
 	bool MovePrevious() override;
 
-	IBase * GetCurrent() override;
-
-	IIterator * Clone() override;
-
 	LibMCData_uint64 Count() override;
 
 };
diff --git a/Implementation/LibMCData/libmcdata_storage.cpp b/Implementation/LibMCData/libmcdata_storage.cpp
index 2e1f1d5c..b8336164 100644
--- a/Implementation/LibMCData/libmcdata_storage.cpp
+++ b/Implementation/LibMCData/libmcdata_storage.cpp
@@ -37,6 +37,7 @@ Abstract: This is a stub class definition of CStorage
 
 // Include custom headers here.
 #include "common_utils.hpp"
+#include "amcdata_storagepath.hpp"
 
 
 #include "PicoSHA2/picosha2.h"
@@ -54,34 +55,50 @@ CStorage::CStorage(AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStor
         throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
     if (pSQLHandler.get() == nullptr)
         throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
+
+    m_AcceptedContentTypes.insert("application/3mf");
+    m_AcceptedContentTypes.insert("text/csv");
+
 }
 
 
 void CStorage::insertDBEntry(const std::string& sUUID, const std::string& sContextUUID, const std::string& sName, const std::string& sMimeType, const LibMCData_uint64 nSize, const std::string& sSHA2, const std::string& sUserID)
 {
 
+    auto pTransaction = m_pSQLHandler->beginTransaction();
+
     std::string sParsedUUID = AMCCommon::CUtils::normalizeUUIDString(sUUID);
     std::string sParsedContextUUID = AMCCommon::CUtils::normalizeUUIDString(sContextUUID);
     std::string sTimestamp = AMCCommon::CUtils::getCurrentISO8601TimeUTC();
 
     std::string sQuery = "SELECT uuid FROM storage_streams WHERE uuid=?";
-    auto pStatement = m_pSQLHandler->prepareStatement(sQuery);
+    auto pStatement = pTransaction->prepareStatement(sQuery);
     pStatement->setString(1, sParsedUUID);
     if (pStatement->nextRow())
         throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_DUPLICATESTORAGESTREAM);
     pStatement = nullptr;
 
-    std::string sInsertQuery = "INSERT INTO storage_streams (uuid, contextuuid, name, mimetype, sha2, size, userid, timestamp) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
-    auto pInsertStatement = m_pSQLHandler->prepareStatement(sInsertQuery);
+    std::string sInsertQuery = "INSERT INTO storage_streams (uuid, name, mimetype, sha2, size, userid, timestamp, status) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
+    auto pInsertStatement = pTransaction->prepareStatement(sInsertQuery);
     pInsertStatement->setString(1, sParsedUUID);
-    pInsertStatement->setString(2, sParsedContextUUID);
-    pInsertStatement->setString(3, sName);
-    pInsertStatement->setString(4, sMimeType);
-    pInsertStatement->setString(5, sSHA2);
-    pInsertStatement->setInt64(6, nSize);
-    pInsertStatement->setString(7, sUserID);
-    pInsertStatement->setString(8, sTimestamp);
+    pInsertStatement->setString(2, sName);
+    pInsertStatement->setString(3, sMimeType);
+    pInsertStatement->setString(4, sSHA2);
+    pInsertStatement->setInt64(5, nSize);
+    pInsertStatement->setString(6, sUserID);
+    pInsertStatement->setString(7, sTimestamp);
+    pInsertStatement->setString(8, AMCData::CStoragePath::storageStreamStatusToString (AMCData::sssNew));
     pInsertStatement->execute();
+    pInsertStatement = nullptr;
+
+    std::string sContextQuery = "INSERT INTO storage_context (streamuuid, contextuuid) VALUES (?, ?)";
+    auto pContextStatement = pTransaction->prepareStatement(sContextQuery);
+    pContextStatement->setString(1, sParsedUUID);
+    pContextStatement->setString(2, sParsedContextUUID);
+    pContextStatement->execute();
+    pContextStatement = nullptr;
+
+    pTransaction->commit();
 }
 
 
@@ -89,9 +106,10 @@ bool CStorage::StreamIsReady(const std::string& sUUID)
 {
     std::string sParsedUUID = AMCCommon::CUtils::normalizeUUIDString(sUUID);
 
-    std::string sQuery = "SELECT uuid FROM storage_streams WHERE uuid=?";
+    std::string sQuery = "SELECT uuid FROM storage_streams WHERE uuid=? AND status=?";
     auto pStatement = m_pSQLHandler->prepareStatement(sQuery);
     pStatement->setString(1, sParsedUUID);
+    pStatement->setString(2, AMCData::CStoragePath::storageStreamStatusToString(AMCData::sssValidated));
     return (pStatement->nextRow());
 }
 
@@ -133,7 +151,7 @@ void CStorage::StoreNewStream(const std::string& sUUID, const std::string& sCont
     }
 
     // Store data asynchroniously on disk and finalize when writing has finished
-    auto pWriter = std::make_shared<AMCData::CStorageWriter>(sUUID, m_pStoragePath->getStreamPath (sUUID), nContentBufferSize);
+    auto pWriter = std::make_shared<AMCData::CStorageWriter>(sUUID, m_pStoragePath->getStreamPath (sUUID), nContentBufferSize, sSHA256);
     pWriter->writeChunkAsync(pContentBuffer, nContentBufferSize, 0);
     pWriter->finalize();
  
@@ -157,7 +175,7 @@ void CStorage::BeginPartialStream(const std::string& sUUID, const std::string& s
         std::string sParsedUUID = AMCCommon::CUtils::normalizeUUIDString(sUUID);
         insertDBEntry(sParsedUUID, sContextUUID, sName, sMimeType, nSize, sSHA2, sUserID);
 
-        auto pWriter = std::make_shared<AMCData::CStorageWriter>(sParsedUUID, m_pStoragePath->getStreamPath(sUUID), nSize);
+        auto pWriter = std::make_shared<AMCData::CStorageWriter>(sParsedUUID, m_pStoragePath->getStreamPath(sUUID), nSize, sSHA2);
         m_PartialWriters.insert(std::make_pair(sParsedUUID, pWriter));
     }
     
@@ -169,7 +187,7 @@ void CStorage::StorePartialStream(const std::string & sUUID, const LibMCData_uin
 
     if (nContentBufferSize == 0)
         throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDBUFFERSIZE);
-    if (pContentBuffer == 0)
+    if (pContentBuffer == nullptr)
         throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARAM);
 
     std::string sParsedUUID = AMCCommon::CUtils::normalizeUUIDString(sUUID);
@@ -191,8 +209,34 @@ void CStorage::FinishPartialStream(const std::string & sUUID)
     if (iIterator == m_PartialWriters.end())
         throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDPARTIALUPLOAD);
 
-    iIterator->second->finalize ();
+    auto pWriter = iIterator->second;
+    m_PartialWriters.erase(iIterator);
+
+    pWriter->finalize ();
+
+    std::string sUpdateQuery = "UPDATE storage_streams SET status=? WHERE uuid=? AND status=?";
+    auto pUpdateStatement = m_pSQLHandler->prepareStatement(sUpdateQuery);
+    pUpdateStatement->setString(1, AMCData::CStoragePath::storageStreamStatusToString(AMCData::sssValidated));
+    pUpdateStatement->setString(2, sUUID);
+    pUpdateStatement->setString(3, AMCData::CStoragePath::storageStreamStatusToString(AMCData::sssNew));
+    pUpdateStatement->execute();
+
+}
+
+
+LibMCData_uint64 CStorage::GetMaxStreamSize()
+{
+    return 1024ULL * 1024ULL * 1024ULL * 32ULL; // 32GB Maximum stream data size
 }
 
+bool CStorage::ContentTypeIsAccepted(const std::string& sContentType)
+{
+    auto sLowerContentType = AMCCommon::CUtils::toLowerString(AMCCommon::CUtils::trimString(sContentType));
+
+    auto iIter = m_AcceptedContentTypes.find(sLowerContentType);
+    return (iIter != m_AcceptedContentTypes.end());
+}
+
+
 
 
diff --git a/Implementation/LibMCData/libmcdata_storage.hpp b/Implementation/LibMCData/libmcdata_storage.hpp
index 3f64de5a..a3ebc79e 100644
--- a/Implementation/LibMCData/libmcdata_storage.hpp
+++ b/Implementation/LibMCData/libmcdata_storage.hpp
@@ -52,6 +52,7 @@ Abstract: This is the class declaration of CStorage
 #include <thread>
 #include <mutex>
 #include <map>
+#include <set>
 
 namespace LibMCData {
 namespace Impl {
@@ -61,6 +62,7 @@ namespace Impl {
  Class declaration of CStorage 
 **************************************************************************************************************************/
 
+
 class CStorage : public virtual IStorage, public virtual CBase {
 private:
     AMCData::PStoragePath m_pStoragePath;
@@ -69,6 +71,8 @@ class CStorage : public virtual IStorage, public virtual CBase {
     std::mutex m_StorageWriteMutex;
     std::map<std::string, AMCData::PStorageWriter> m_PartialWriters;
 
+    std::set<std::string> m_AcceptedContentTypes;
+
     void insertDBEntry(const std::string& sUUID, const std::string& sContextUUID, const std::string& sName, const std::string& sMimeType, const LibMCData_uint64 nSize, const std::string& sSHA2, const std::string& sUserID);
 
 protected:
@@ -89,6 +93,10 @@ class CStorage : public virtual IStorage, public virtual CBase {
 
 	void FinishPartialStream(const std::string & sUUID) override;
 
+    LibMCData_uint64 GetMaxStreamSize() override;
+
+    bool ContentTypeIsAccepted(const std::string& sContentType) override;
+
 };
 
 } // namespace Impl
diff --git a/Implementation/LibMCData/libmcdata_storagestream.cpp b/Implementation/LibMCData/libmcdata_storagestream.cpp
index 288d9aaf..34ad6397 100644
--- a/Implementation/LibMCData/libmcdata_storagestream.cpp
+++ b/Implementation/LibMCData/libmcdata_storagestream.cpp
@@ -100,10 +100,9 @@ uint32_t storageStream_SeekCallback(uint64_t nPosition, void* pUserData)
 }
 
 
-CStorageStream::CStorageStream(AMCCommon::PImportStream pImportStream, const std::string& sUUID, const std::string& sContextUUID, const std::string& sName, const uint64_t nSize, const std::string& sMIMEType, const std::string& sSHA2, const std::string& sTimeStamp, const std::string& sUserID)
+CStorageStream::CStorageStream(AMCCommon::PImportStream pImportStream, const std::string& sUUID, const std::string& sName, const uint64_t nSize, const std::string& sMIMEType, const std::string& sSHA2, const std::string& sTimeStamp, const std::string& sUserID)
 	: m_pImportStream (pImportStream),
 	m_sUUID (AMCCommon::CUtils::normalizeUUIDString(sUUID)),
-	m_sContextUUID(AMCCommon::CUtils::normalizeUUIDString(sContextUUID)),
 	m_sName (sName),
 	m_nSize (nSize),
 	m_sMIMEType (sMIMEType),
@@ -119,9 +118,9 @@ CStorageStream::CStorageStream(AMCCommon::PImportStream pImportStream, const std
 }
 
 
-CStorageStream* CStorageStream::make(AMCCommon::PImportStream pImportStream, const std::string& sUUID, const std::string& sContextUUID, const std::string& sName, const uint64_t nSize, const std::string& sMIMEType, const std::string& sSHA2, const std::string& sTimeStamp, const std::string& sUserID)
+CStorageStream* CStorageStream::make(AMCCommon::PImportStream pImportStream, const std::string& sUUID, const std::string& sName, const uint64_t nSize, const std::string& sMIMEType, const std::string& sSHA2, const std::string& sTimeStamp, const std::string& sUserID)
 {
-	return new CStorageStream (pImportStream, sUUID, sContextUUID, sName, nSize, sMIMEType, sSHA2, sTimeStamp, sUserID);
+	return new CStorageStream (pImportStream, sUUID, sName, nSize, sMIMEType, sSHA2, sTimeStamp, sUserID);
 }
 
 CStorageStream* CStorageStream::makeFromDatabase(const std::string& sStreamUUID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
@@ -133,29 +132,29 @@ CStorageStream* CStorageStream::makeFromDatabase(const std::string& sStreamUUID,
 
 	auto sParsedStreamUUID = AMCCommon::CUtils::normalizeUUIDString(sStreamUUID);
 
-	std::string sQuery = "SELECT uuid, contextuuid, name, mimetype, sha2, size, userid, timestamp FROM storage_streams WHERE uuid=?";
+	std::string sQuery = "SELECT uuid, name, mimetype, sha2, size, userid, timestamp FROM storage_streams WHERE uuid=?";
 	auto pStatement = pSQLHandler->prepareStatement(sQuery);
 	pStatement->setString(1, sParsedStreamUUID);
+	//pStatement->setString(2, AMCData::CStoragePath::storageStreamStatusToString(AMCData::sssValidated));
 	if (!pStatement->nextRow())
 		throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_STORAGESTREAMNOTFOUND);
 
 	auto sUUID = pStatement->getColumnString(1);
-	auto sContextUUID = pStatement->getColumnString(2);
-	auto sName = pStatement->getColumnString(3);
-	auto sMIMEType = pStatement->getColumnString(4);
-	auto sSHA2 = pStatement->getColumnString(5);
-	auto nSize = pStatement->getColumnInt64(6);
-	auto sUserID = pStatement->getColumnString(7);
-	auto sTimeStamp = pStatement->getColumnString(8);
+	auto sName = pStatement->getColumnString(2);
+	auto sMIMEType = pStatement->getColumnString(3);
+	auto sSHA2 = pStatement->getColumnString(4);
+	auto nSize = pStatement->getColumnInt64(5);
+	auto sUserID = pStatement->getColumnString(6);
+	auto sTimeStamp = pStatement->getColumnString(7);
 
 	auto pImportStream = std::make_shared<AMCCommon::CImportStream_Native>(pStoragePath->getStreamPath(sParsedStreamUUID));
 	
-	return make (pImportStream, sUUID, sContextUUID, sName, (uint64_t)nSize, sMIMEType, sSHA2, sTimeStamp, sUserID);
+	return make (pImportStream, sUUID, sName, (uint64_t)nSize, sMIMEType, sSHA2, sTimeStamp, sUserID);
 }
 
-PStorageStream CStorageStream::makeShared(AMCCommon::PImportStream pImportStream, const std::string& sUUID, const std::string& sContextUUID, const std::string& sName, const uint64_t nSize, const std::string& sMIMEType, const std::string& sSHA2, const std::string& sTimeStamp, const std::string& sUserID)
+PStorageStream CStorageStream::makeShared(AMCCommon::PImportStream pImportStream, const std::string& sUUID, const std::string& sName, const uint64_t nSize, const std::string& sMIMEType, const std::string& sSHA2, const std::string& sTimeStamp, const std::string& sUserID)
 {
-	return std::shared_ptr<CStorageStream>(make(pImportStream, sUUID, sContextUUID, sName, nSize, sMIMEType, sSHA2, sTimeStamp, sUserID));
+	return std::shared_ptr<CStorageStream>(make(pImportStream, sUUID, sName, nSize, sMIMEType, sSHA2, sTimeStamp, sUserID));
 }
 
 PStorageStream CStorageStream::makeSharedFromDatabase(const std::string& sStreamUUID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath)
@@ -176,11 +175,6 @@ std::string CStorageStream::GetUUID()
 	return m_sUUID;
 }
 
-std::string CStorageStream::GetContextUUID()
-{
-	return m_sContextUUID;
-}
-
 std::string CStorageStream::GetTimeStamp()
 {
 	return m_sTimeStamp;
@@ -227,12 +221,12 @@ void CStorageStream::GetContent(LibMCData_uint64 nContentBufferSize, LibMCData_u
 
 void CStorageStream::GetCallbacks(LibMCData_pvoid & pTheReadCallback, LibMCData_pvoid & pTheSeekCallback, LibMCData_pvoid & pStreamHandle)
 {
-	pTheReadCallback = &storageStream_ReadCallback;
-	pTheSeekCallback = &storageStream_SeekCallback;
-	pStreamHandle = &m_sStreamCallbackData;
+	pTheReadCallback = (void*)&storageStream_ReadCallback;
+	pTheSeekCallback = (void*)&storageStream_SeekCallback;
+	pStreamHandle = (void*)&m_sStreamCallbackData;
 }
 
 AMCCommon::CImportStream* CStorageStream::getImportStream()
 {
 	return m_pImportStream.get();
-}
\ No newline at end of file
+}
diff --git a/Implementation/LibMCData/libmcdata_storagestream.hpp b/Implementation/LibMCData/libmcdata_storagestream.hpp
index 79783beb..2e43aede 100644
--- a/Implementation/LibMCData/libmcdata_storagestream.hpp
+++ b/Implementation/LibMCData/libmcdata_storagestream.hpp
@@ -75,7 +75,6 @@ class CStorageStream : public virtual IStorageStream, public virtual CBase {
 private:
 
 	std::string m_sUUID;
-	std::string m_sContextUUID;
 	std::string m_sName;
 	uint64_t m_nSize;
 	std::string m_sMIMEType;
@@ -88,21 +87,19 @@ class CStorageStream : public virtual IStorageStream, public virtual CBase {
 
 protected:
 
-	CStorageStream(AMCCommon::PImportStream pImportStream, const std::string& sUUID, const std::string& sContextUUID, const std::string& sName, const uint64_t nSize, const std::string& sMIMEType, const std::string& sSHA2, const std::string& sTimeStamp, const std::string& sUserID);
+	CStorageStream(AMCCommon::PImportStream pImportStream, const std::string& sUUID, const std::string& sName, const uint64_t nSize, const std::string& sMIMEType, const std::string& sSHA2, const std::string& sTimeStamp, const std::string& sUserID);
 
 public:
 
-	static CStorageStream* make (AMCCommon::PImportStream pImportStream, const std::string& sUUID, const std::string& sContextUUID, const std::string& sName, const uint64_t nSize, const std::string& sMIMEType, const std::string& sSHA2, const std::string& sTimeStamp, const std::string& sUserID);
+	static CStorageStream* make (AMCCommon::PImportStream pImportStream, const std::string& sUUID, const std::string& sName, const uint64_t nSize, const std::string& sMIMEType, const std::string& sSHA2, const std::string& sTimeStamp, const std::string& sUserID);
 	static CStorageStream* makeFromDatabase (const std::string& sStreamUUID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
-	static PStorageStream makeShared(AMCCommon::PImportStream pImportStream, const std::string& sUUID, const std::string& sContextUUID, const std::string& sName, const uint64_t nSize, const std::string& sMIMEType, const std::string& sSHA2, const std::string& sTimeStamp, const std::string& sUserID);
+	static PStorageStream makeShared(AMCCommon::PImportStream pImportStream, const std::string& sUUID, const std::string& sName, const uint64_t nSize, const std::string& sMIMEType, const std::string& sSHA2, const std::string& sTimeStamp, const std::string& sUserID);
 	static PStorageStream makeSharedFromDatabase(const std::string& sStreamUUID, AMCData::PSQLHandler pSQLHandler, AMCData::PStoragePath pStoragePath);
 
 	~CStorageStream();
 
 	std::string GetUUID() override;
 
-	std::string GetContextUUID() override;
-
 	std::string GetTimeStamp() override;
 
 	std::string GetName() override;
diff --git a/Implementation/LibMCDriverEnv/libmcdriverenv_driverenvironment.cpp b/Implementation/LibMCDriverEnv/libmcdriverenv_driverenvironment.cpp
index 997b6890..41fc8d3d 100644
--- a/Implementation/LibMCDriverEnv/libmcdriverenv_driverenvironment.cpp
+++ b/Implementation/LibMCDriverEnv/libmcdriverenv_driverenvironment.cpp
@@ -6,16 +6,16 @@ All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
-	* Redistributions of source code must retain the above copyright
-	  notice, this list of conditions and the following disclaimer.
-	* Redistributions in binary form must reproduce the above copyright
-	  notice, this list of conditions and the following disclaimer in the
-	  documentation and/or other materials provided with the distribution.
-	* Neither the name of the Autodesk Inc. nor the
-	  names of its contributors may be used to endorse or promote products
-	  derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
@@ -26,10 +26,14 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+Abstract: This is a stub class definition of CDriverEnvironment
+
 */
 
 #include "libmcdriverenv_driverenvironment.hpp"
 #include "libmcdriverenv_interfaceexception.hpp"
+#include "libmcdriverenv_workingdirectory.hpp"
 
 // Include custom headers here.
 
@@ -40,3 +44,13 @@ using namespace LibMCDriverEnv::Impl;
  Class definition of CDriverEnvironment 
 **************************************************************************************************************************/
 
+IWorkingDirectory * CDriverEnvironment::CreateWorkingDirectory()
+{
+    return new CWorkingDirectory();
+}
+
+void CDriverEnvironment::RetrieveDriverData(const std::string & sIdentifier, LibMCDriverEnv_uint64 nDataBufferBufferSize, LibMCDriverEnv_uint64* pDataBufferNeededCount, LibMCDriverEnv_uint8 * pDataBufferBuffer)
+{
+	
+}
+
diff --git a/Implementation/LibMCDriverEnv/libmcdriverenv_driverenvironment.hpp b/Implementation/LibMCDriverEnv/libmcdriverenv_driverenvironment.hpp
index 048e231f..186213c4 100644
--- a/Implementation/LibMCDriverEnv/libmcdriverenv_driverenvironment.hpp
+++ b/Implementation/LibMCDriverEnv/libmcdriverenv_driverenvironment.hpp
@@ -6,16 +6,16 @@ All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
-	* Redistributions of source code must retain the above copyright
-	  notice, this list of conditions and the following disclaimer.
-	* Redistributions in binary form must reproduce the above copyright
-	  notice, this list of conditions and the following disclaimer in the
-	  documentation and/or other materials provided with the distribution.
-	* Neither the name of the Autodesk Inc. nor the
-	  names of its contributors may be used to endorse or promote products
-	  derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
@@ -26,6 +26,9 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+Abstract: This is the class declaration of CDriverEnvironment
+
 */
 
 
@@ -76,6 +79,10 @@ class CDriverEnvironment : public virtual IDriverEnvironment, public virtual CBa
 	* Public member functions to implement.
 	*/
 
+	IWorkingDirectory * CreateWorkingDirectory() override;
+
+	void RetrieveDriverData(const std::string & sIdentifier, LibMCDriverEnv_uint64 nDataBufferBufferSize, LibMCDriverEnv_uint64* pDataBufferNeededCount, LibMCDriverEnv_uint8 * pDataBufferBuffer) override;
+
 };
 
 } // namespace Impl
diff --git a/Implementation/LibMCDriverEnv/libmcdriverenv_workingdirectory.cpp b/Implementation/LibMCDriverEnv/libmcdriverenv_workingdirectory.cpp
new file mode 100644
index 00000000..577f149f
--- /dev/null
+++ b/Implementation/LibMCDriverEnv/libmcdriverenv_workingdirectory.cpp
@@ -0,0 +1,60 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CWorkingDirectory
+
+*/
+
+#include "libmcdriverenv_workingdirectory.hpp"
+#include "libmcdriverenv_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibMCDriverEnv::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CWorkingDirectory 
+**************************************************************************************************************************/
+
+std::string CWorkingDirectory::GetAbsoluteFilePath()
+{
+	throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_NOTIMPLEMENTED);
+}
+
+IWorkingFile * CWorkingDirectory::StoreCustomData(const std::string & sFileName, const LibMCDriverEnv_uint64 nDataBufferBufferSize, const LibMCDriverEnv_uint8 * pDataBufferBuffer)
+{
+	throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_NOTIMPLEMENTED);
+}
+
+IWorkingFile * CWorkingDirectory::StoreDriverData(const std::string & sFileName, const std::string & sIdentifier)
+{
+	throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_NOTIMPLEMENTED);
+}
+
diff --git a/Implementation/LibMCDriverEnv/libmcdriverenv_workingdirectory.hpp b/Implementation/LibMCDriverEnv/libmcdriverenv_workingdirectory.hpp
new file mode 100644
index 00000000..00edd5bb
--- /dev/null
+++ b/Implementation/LibMCDriverEnv/libmcdriverenv_workingdirectory.hpp
@@ -0,0 +1,96 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CWorkingDirectory
+
+*/
+
+
+#ifndef __LIBMCDRIVERENV_WORKINGDIRECTORY
+#define __LIBMCDRIVERENV_WORKINGDIRECTORY
+
+#include "libmcdriverenv_interfaces.hpp"
+
+// Parent classes
+#include "libmcdriverenv_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibMCDriverEnv {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CWorkingDirectory 
+**************************************************************************************************************************/
+
+class CWorkingDirectory : public virtual IWorkingDirectory, public virtual CBase {
+private:
+
+	/**
+	* Put private members here.
+	*/
+
+protected:
+
+	/**
+	* Put protected members here.
+	*/
+
+public:
+
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
+
+
+	/**
+	* Public member functions to implement.
+	*/
+
+	std::string GetAbsoluteFilePath() override;
+
+	IWorkingFile * StoreCustomData(const std::string & sFileName, const LibMCDriverEnv_uint64 nDataBufferBufferSize, const LibMCDriverEnv_uint8 * pDataBufferBuffer) override;
+
+	IWorkingFile * StoreDriverData(const std::string & sFileName, const std::string & sIdentifier) override;
+
+};
+
+} // namespace Impl
+} // namespace LibMCDriverEnv
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBMCDRIVERENV_WORKINGDIRECTORY
diff --git a/Implementation/LibMCDriverEnv/libmcdriverenv_workingfile.cpp b/Implementation/LibMCDriverEnv/libmcdriverenv_workingfile.cpp
new file mode 100644
index 00000000..b6cd8c2d
--- /dev/null
+++ b/Implementation/LibMCDriverEnv/libmcdriverenv_workingfile.cpp
@@ -0,0 +1,70 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CWorkingFile
+
+*/
+
+#include "libmcdriverenv_workingfile.hpp"
+#include "libmcdriverenv_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibMCDriverEnv::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CWorkingFile 
+**************************************************************************************************************************/
+
+std::string CWorkingFile::GetAbsoluteFileName()
+{
+	throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_NOTIMPLEMENTED);
+}
+
+LibMCDriverEnv_uint64 CWorkingFile::GetSize()
+{
+	throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_NOTIMPLEMENTED);
+}
+
+std::string CWorkingFile::CalculateSHA2()
+{
+	throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_NOTIMPLEMENTED);
+}
+
+void CWorkingFile::DeleteFile()
+{
+	throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_NOTIMPLEMENTED);
+}
+
+IWorkingFileExecution * CWorkingFile::ExecuteFile()
+{
+	throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_NOTIMPLEMENTED);
+}
+
diff --git a/Implementation/LibMCDriverEnv/libmcdriverenv_workingfile.hpp b/Implementation/LibMCDriverEnv/libmcdriverenv_workingfile.hpp
new file mode 100644
index 00000000..0ae6842a
--- /dev/null
+++ b/Implementation/LibMCDriverEnv/libmcdriverenv_workingfile.hpp
@@ -0,0 +1,100 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CWorkingFile
+
+*/
+
+
+#ifndef __LIBMCDRIVERENV_WORKINGFILE
+#define __LIBMCDRIVERENV_WORKINGFILE
+
+#include "libmcdriverenv_interfaces.hpp"
+
+// Parent classes
+#include "libmcdriverenv_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibMCDriverEnv {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CWorkingFile 
+**************************************************************************************************************************/
+
+class CWorkingFile : public virtual IWorkingFile, public virtual CBase {
+private:
+
+	/**
+	* Put private members here.
+	*/
+
+protected:
+
+	/**
+	* Put protected members here.
+	*/
+
+public:
+
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
+
+
+	/**
+	* Public member functions to implement.
+	*/
+
+	std::string GetAbsoluteFileName() override;
+
+	LibMCDriverEnv_uint64 GetSize() override;
+
+	std::string CalculateSHA2() override;
+
+	void DeleteFile() override;
+
+	IWorkingFileExecution * ExecuteFile() override;
+
+};
+
+} // namespace Impl
+} // namespace LibMCDriverEnv
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBMCDRIVERENV_WORKINGFILE
diff --git a/Implementation/LibMCDriverEnv/libmcdriverenv_workingfileexecution.cpp b/Implementation/LibMCDriverEnv/libmcdriverenv_workingfileexecution.cpp
new file mode 100644
index 00000000..0de4f6a9
--- /dev/null
+++ b/Implementation/LibMCDriverEnv/libmcdriverenv_workingfileexecution.cpp
@@ -0,0 +1,55 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CWorkingFileExecution
+
+*/
+
+#include "libmcdriverenv_workingfileexecution.hpp"
+#include "libmcdriverenv_interfaceexception.hpp"
+
+// Include custom headers here.
+
+
+using namespace LibMCDriverEnv::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CWorkingFileExecution 
+**************************************************************************************************************************/
+
+void CWorkingFileExecution::GetStatus()
+{
+	throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_NOTIMPLEMENTED);
+}
+
+std::string CWorkingFileExecution::ReturnStdOut()
+{
+	throw ELibMCDriverEnvInterfaceException(LIBMCDRIVERENV_ERROR_NOTIMPLEMENTED);
+}
+
diff --git a/Implementation/LibMCDriverEnv/libmcdriverenv_workingfileexecution.hpp b/Implementation/LibMCDriverEnv/libmcdriverenv_workingfileexecution.hpp
new file mode 100644
index 00000000..faac542d
--- /dev/null
+++ b/Implementation/LibMCDriverEnv/libmcdriverenv_workingfileexecution.hpp
@@ -0,0 +1,94 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CWorkingFileExecution
+
+*/
+
+
+#ifndef __LIBMCDRIVERENV_WORKINGFILEEXECUTION
+#define __LIBMCDRIVERENV_WORKINGFILEEXECUTION
+
+#include "libmcdriverenv_interfaces.hpp"
+
+// Parent classes
+#include "libmcdriverenv_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+
+
+namespace LibMCDriverEnv {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CWorkingFileExecution 
+**************************************************************************************************************************/
+
+class CWorkingFileExecution : public virtual IWorkingFileExecution, public virtual CBase {
+private:
+
+	/**
+	* Put private members here.
+	*/
+
+protected:
+
+	/**
+	* Put protected members here.
+	*/
+
+public:
+
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
+
+
+	/**
+	* Public member functions to implement.
+	*/
+
+	void GetStatus() override;
+
+	std::string ReturnStdOut() override;
+
+};
+
+} // namespace Impl
+} // namespace LibMCDriverEnv
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBMCDRIVERENV_WORKINGFILEEXECUTION
diff --git a/Implementation/LibMCEnv/libmcenv_build.cpp b/Implementation/LibMCEnv/libmcenv_build.cpp
new file mode 100644
index 00000000..0f67033c
--- /dev/null
+++ b/Implementation/LibMCEnv/libmcenv_build.cpp
@@ -0,0 +1,127 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is a stub class definition of CBuild
+
+*/
+
+#include "libmcenv_build.hpp"
+#include "libmcenv_interfaceexception.hpp"
+#include "libmcenv_toolpathaccessor.hpp"
+
+// Include custom headers here.
+#include "amc_systemstate.hpp"
+#include "amc_toolpathhandler.hpp"
+
+#include "common_utils.hpp"
+
+using namespace LibMCEnv::Impl;
+
+/*************************************************************************************************************************
+ Class definition of CBuild 
+**************************************************************************************************************************/
+
+CBuild::CBuild(LibMCData::PBuildJob pBuildJob, AMC::PSystemState pSystemState)
+	: m_pBuildJob(pBuildJob), m_pSystemState (pSystemState)
+{
+	if (pSystemState.get() == nullptr)
+		throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDPARAM);
+	if (pBuildJob.get() == nullptr)
+		throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDPARAM);
+}
+
+
+std::string CBuild::GetName()
+{
+	return m_pBuildJob->GetName();
+}
+
+std::string CBuild::GetBuildUUID()
+{
+	return m_pBuildJob->GetUUID();
+}
+
+std::string CBuild::GetStorageUUID()
+{
+	return m_pBuildJob->GetStorageStreamUUID();
+}
+
+std::string CBuild::GetStorageSHA256()
+{
+	return m_pBuildJob->GetStorageStream()->GetSHA2 ();
+
+}
+
+LibMCEnv_uint32 CBuild::GetLayerCount()
+{
+	return m_pBuildJob->GetLayerCount();
+}
+
+IToolpathAccessor * CBuild::CreateToolpathAccessor()
+{
+	auto sStreamUUID = m_pBuildJob->GetStorageStreamUUID();
+	return new CToolpathAccessor(sStreamUUID, m_pSystemState->getToolpathHandlerInstance());
+}
+
+
+void CBuild::LoadToolpath()
+{
+	auto sStreamUUID = m_pBuildJob->GetStorageStreamUUID();
+	m_pSystemState->toolpathHandler()->loadToolpathEntity(sStreamUUID);
+}
+
+
+void CBuild::UnloadToolpath()
+{
+	auto sStreamUUID = m_pBuildJob->GetStorageStreamUUID();
+	m_pSystemState->toolpathHandler()->unloadToolpathEntity(sStreamUUID);
+}
+
+bool CBuild::ToolpathIsLoaded()
+{
+	auto sStreamUUID = m_pBuildJob->GetStorageStreamUUID();
+	return (m_pSystemState->toolpathHandler()->findToolpathEntity(sStreamUUID, false) != nullptr);
+}
+
+std::string CBuild::AddBinaryData(const std::string & sName, const std::string & sMIMEType, const LibMCEnv_uint64 nContentBufferSize, const LibMCEnv_uint8 * pContentBuffer)
+{
+	auto sDataUUID = AMCCommon::CUtils::createUUID();
+	auto sSystemUserID = m_pSystemState->getSystemUserID ();
+
+	auto pStorage = m_pSystemState->storage();
+	pStorage->StoreNewStream(sDataUUID, m_pBuildJob->GetUUID(), sName, sMIMEType, LibMCData::CInputVector<uint8_t>(pContentBuffer, nContentBufferSize), sSystemUserID);
+
+	auto pStorageStream = pStorage->RetrieveStream(sDataUUID);
+	m_pBuildJob->AddJobData(sName, pStorageStream, LibMCData::eBuildJobDataType::CustomBinaryData, sSystemUserID);
+
+	return sDataUUID;
+
+
+}
+
diff --git a/Implementation/LibMCEnv/libmcenv_build.hpp b/Implementation/LibMCEnv/libmcenv_build.hpp
new file mode 100644
index 00000000..ae3e9495
--- /dev/null
+++ b/Implementation/LibMCEnv/libmcenv_build.hpp
@@ -0,0 +1,98 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Abstract: This is the class declaration of CBuild
+
+*/
+
+
+#ifndef __LIBMCENV_BUILD
+#define __LIBMCENV_BUILD
+
+#include "libmcenv_interfaces.hpp"
+
+// Parent classes
+#include "libmcenv_base.hpp"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+// Include custom headers here.
+#include "libmcdata_dynamic.hpp"
+#include "amc_systemstate.hpp"
+
+namespace LibMCEnv {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CBuild 
+**************************************************************************************************************************/
+
+class CBuild : public virtual IBuild, public virtual CBase {
+private:
+
+	AMC::PSystemState m_pSystemState;
+	LibMCData::PBuildJob m_pBuildJob;
+
+
+public:
+
+	CBuild(LibMCData::PBuildJob pBuildJob, AMC::PSystemState pSystemState);
+
+	std::string GetName() override;
+
+	std::string GetBuildUUID() override;
+
+	std::string GetStorageUUID() override;
+
+	std::string GetStorageSHA256() override;
+
+	LibMCEnv_uint32 GetLayerCount() override;
+
+	void LoadToolpath() override;
+
+	void UnloadToolpath() override;
+
+	bool ToolpathIsLoaded() override;
+
+	IToolpathAccessor* CreateToolpathAccessor() override;
+
+	std::string AddBinaryData(const std::string & sName, const std::string & sMIMEType, const LibMCEnv_uint64 nContentBufferSize, const LibMCEnv_uint8 * pContentBuffer) override;
+
+};
+
+} // namespace Impl
+} // namespace LibMCEnv
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // __LIBMCENV_BUILD
diff --git a/Implementation/LibMCEnv/libmcenv_signalhandler.cpp b/Implementation/LibMCEnv/libmcenv_signalhandler.cpp
index 49245a70..2d888de9 100644
--- a/Implementation/LibMCEnv/libmcenv_signalhandler.cpp
+++ b/Implementation/LibMCEnv/libmcenv_signalhandler.cpp
@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "libmcenv_interfaceexception.hpp"
 
 // Include custom headers here.
-
+#include "Common/common_utils.hpp"
 
 using namespace LibMCEnv::Impl;
 
@@ -85,6 +85,11 @@ std::string CSignalHandler::GetString(const std::string & sName)
 	return m_pParameterGroup->getParameterValueByName(sName);
 }
 
+std::string CSignalHandler::GetUUID(const std::string& sName)
+{
+	return AMCCommon::CUtils::normalizeUUIDString (m_pParameterGroup->getParameterValueByName(sName));
+}
+
 LibMCEnv_double CSignalHandler::GetDouble(const std::string & sName)
 {
 	return m_pParameterGroup->getDoubleParameterValueByName(sName);
@@ -105,6 +110,12 @@ void CSignalHandler::SetStringResult(const std::string & sName, const std::strin
 	m_pResultGroup->setParameterValueByName(sName, sValue);
 }
 
+void CSignalHandler::SetUUIDResult(const std::string& sName, const std::string& sValue)
+{
+	m_pResultGroup->setParameterValueByName(sName, AMCCommon::CUtils::normalizeUUIDString (sValue));
+}
+
+
 void CSignalHandler::SetDoubleResult(const std::string & sName, const LibMCEnv_double dValue)
 {
 	m_pResultGroup->setDoubleParameterValueByName(sName, dValue);
diff --git a/Implementation/LibMCEnv/libmcenv_signalhandler.hpp b/Implementation/LibMCEnv/libmcenv_signalhandler.hpp
index dc593528..bf1ab229 100644
--- a/Implementation/LibMCEnv/libmcenv_signalhandler.hpp
+++ b/Implementation/LibMCEnv/libmcenv_signalhandler.hpp
@@ -82,6 +82,8 @@ class CSignalHandler : public virtual ISignalHandler, public virtual CBase {
 
 	std::string GetString(const std::string & sName) override;
 
+	std::string GetUUID(const std::string& sName) override;
+
 	LibMCEnv_double GetDouble(const std::string & sName) override;
 
 	LibMCEnv_int64 GetInteger(const std::string & sName) override;
@@ -90,6 +92,8 @@ class CSignalHandler : public virtual ISignalHandler, public virtual CBase {
 
 	void SetStringResult(const std::string & sName, const std::string & sValue) override;
 
+	void SetUUIDResult(const std::string& sName, const std::string& sValue) override;
+
 	void SetDoubleResult(const std::string & sName, const LibMCEnv_double dValue) override;
 
 	void SetIntegerResult(const std::string & sName, const LibMCEnv_int64 nValue) override;
diff --git a/Implementation/LibMCEnv/libmcenv_signaltrigger.cpp b/Implementation/LibMCEnv/libmcenv_signaltrigger.cpp
index c2cfc1c4..3d8b88d9 100644
--- a/Implementation/LibMCEnv/libmcenv_signaltrigger.cpp
+++ b/Implementation/LibMCEnv/libmcenv_signaltrigger.cpp
@@ -118,6 +118,12 @@ void CSignalTrigger::SetString(const std::string & sName, const std::string & sV
 	m_pParameterGroup->setParameterValueByName(sName, sValue);
 }
 
+void CSignalTrigger::SetUUID(const std::string& sName, const std::string& sValue)
+{
+	m_pParameterGroup->setParameterValueByName(sName, AMCCommon::CUtils::normalizeUUIDString (sValue));
+}
+
+
 void CSignalTrigger::SetDouble(const std::string & sName, const LibMCEnv_double dValue)
 {
 	m_pParameterGroup->setDoubleParameterValueByName(sName, dValue);
@@ -138,6 +144,13 @@ std::string CSignalTrigger::GetStringResult(const std::string & sName)
 	return m_pResultGroup->getParameterValueByName(sName);
 }
 
+
+std::string CSignalTrigger::GetUUIDResult(const std::string& sName)
+{
+	return AMCCommon::CUtils::normalizeUUIDString (m_pResultGroup->getParameterValueByName(sName));
+}
+
+
 LibMCEnv_double CSignalTrigger::GetDoubleResult(const std::string & sName)
 {
 	return m_pResultGroup->getDoubleParameterValueByName(sName);
diff --git a/Implementation/LibMCEnv/libmcenv_signaltrigger.hpp b/Implementation/LibMCEnv/libmcenv_signaltrigger.hpp
index 177d1644..5ee68e67 100644
--- a/Implementation/LibMCEnv/libmcenv_signaltrigger.hpp
+++ b/Implementation/LibMCEnv/libmcenv_signaltrigger.hpp
@@ -86,6 +86,8 @@ class CSignalTrigger : public virtual ISignalTrigger, public virtual CBase {
 
 	void SetString(const std::string & sName, const std::string & sValue) override;
 
+	void SetUUID(const std::string& sName, const std::string& sValue) override;
+
 	void SetDouble(const std::string & sName, const LibMCEnv_double dValue) override;
 
 	void SetInteger(const std::string & sName, const LibMCEnv_int64 nValue) override;
@@ -94,6 +96,8 @@ class CSignalTrigger : public virtual ISignalTrigger, public virtual CBase {
 
 	std::string GetStringResult(const std::string & sName) override;
 
+	std::string GetUUIDResult(const std::string& sName) override;
+
 	LibMCEnv_double GetDoubleResult(const std::string & sName) override;
 
 	LibMCEnv_int64 GetIntegerResult(const std::string & sName) override;
diff --git a/Implementation/LibMCEnv/libmcenv_stateenvironment.cpp b/Implementation/LibMCEnv/libmcenv_stateenvironment.cpp
index 506f676a..b30486d2 100644
--- a/Implementation/LibMCEnv/libmcenv_stateenvironment.cpp
+++ b/Implementation/LibMCEnv/libmcenv_stateenvironment.cpp
@@ -34,7 +34,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "libmcenv_signalhandler.hpp"
 #include "libmcenv_signaltrigger.hpp"
 #include "libmcenv_toolpathaccessor.hpp"
+#include "libmcenv_build.hpp"
 
+#include "amc_logger.hpp"
+#include "amc_driverhandler.hpp"
+#include "amc_parameterhandler.hpp"
 
 #include <thread> 
 
@@ -59,7 +63,7 @@ CStateEnvironment::CStateEnvironment(AMC::PSystemState pSystemState, AMC::PParam
 }
 
 
-ISignalTrigger* CStateEnvironment::CreateSignal(const std::string& sMachineInstance, const std::string& sSignalName)
+ISignalTrigger* CStateEnvironment::PrepareSignal(const std::string& sMachineInstance, const std::string& sSignalName)
 {
 	if (!m_pSystemState->stateSignalHandler()->hasSignalDefinition(sMachineInstance, sSignalName))
 		throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_COULDNOTFINDSIGNALDEFINITON);
@@ -98,15 +102,13 @@ bool CStateEnvironment::WaitForSignal(const std::string& sSignalName, const LibM
 }
 
 
-void CStateEnvironment::LoadToolpath(const std::string& sToolpathUUID)
+IBuild* CStateEnvironment::GetBuildJob(const std::string& sBuildUUID)
 {
-	m_pSystemState->toolpathHandler()->loadToolpathEntity(sToolpathUUID);
+	auto pBuildJobHandler = m_pSystemState->buildJobHandler();
+	auto pBuildJob = pBuildJobHandler->RetrieveJob(sBuildUUID);
+	return new CBuild(pBuildJob, m_pSystemState);
 }
 
-void CStateEnvironment::UnloadToolpath(const std::string& sToolpathUUID)
-{
-	m_pSystemState->toolpathHandler()->unloadToolpathEntity(sToolpathUUID);
-}
 
 void CStateEnvironment::UnloadAllToolpathes()
 {
@@ -114,11 +116,6 @@ void CStateEnvironment::UnloadAllToolpathes()
 }
 
 
-IToolpathAccessor* CStateEnvironment::CreateToolpathAccessor(const std::string& sToolpathUUID)
-{
-	return new CToolpathAccessor(sToolpathUUID, m_pSystemState->getToolpathHandlerInstance ());
-}
-
 
 void CStateEnvironment::GetDriverLibrary(const std::string& sDriverName, std::string& sDriverType, LibMCEnv_pvoid& pDriverLookup)
 {
@@ -131,12 +128,6 @@ void CStateEnvironment::CreateDriverAccess(const std::string& sDriverName, LibMC
 }
 
 
-bool CStateEnvironment::ToolpathIsLoaded(const std::string& sToolpathUUID)
-{
-	return (m_pSystemState->toolpathHandler ()->findToolpathEntity(sToolpathUUID, false) != nullptr);
-}
-
-
 
 void CStateEnvironment::SetNextState(const std::string & sStateName)
 {
@@ -188,6 +179,20 @@ void CStateEnvironment::StoreString(const std::string& sName, const std::string&
 
 }
 
+void CStateEnvironment::StoreUUID(const std::string& sName, const std::string& sValue)
+{
+	AMC::CParameterGroup* pGroup = m_pParameterHandler->getDataStore();
+
+	if (!pGroup->hasParameter(sName)) {
+		pGroup->addNewStringParameter(sName, "", AMCCommon::CUtils::normalizeUUIDString (sValue));
+	}
+	else {
+		pGroup->setParameterValueByName(sName, AMCCommon::CUtils::normalizeUUIDString (sValue));
+	}
+
+}
+
+
 void CStateEnvironment::StoreInteger(const std::string& sName, const LibMCEnv_int64 nValue)
 {
 	AMC::CParameterGroup* pGroup = m_pParameterHandler->getDataStore();
@@ -249,6 +254,15 @@ std::string CStateEnvironment::RetrieveString(const std::string& sName)
 	return pGroup->getParameterValueByName(sName);
 }
 
+
+std::string CStateEnvironment::RetrieveUUID(const std::string& sName)
+{
+	AMC::CParameterGroup* pGroup = m_pParameterHandler->getDataStore();
+
+	return AMCCommon::CUtils::normalizeUUIDString (pGroup->getParameterValueByName(sName));
+}
+
+
 LibMCEnv_int64 CStateEnvironment::RetrieveInteger(const std::string& sName)
 {
 	AMC::CParameterGroup* pGroup = m_pParameterHandler->getDataStore();
@@ -298,6 +312,20 @@ void CStateEnvironment::SetStringParameter(const std::string& sParameterGroup, c
 	pGroup->setParameterValueByName(sParameterName, sValue);
 }
 
+
+void CStateEnvironment::SetUUIDParameter(const std::string& sParameterGroup, const std::string& sParameterName, const std::string& sValue)
+{
+	if (!m_pParameterHandler->hasGroup(sParameterGroup))
+		throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_PARAMETERGROUPNOTFOUND);
+
+	auto pGroup = m_pParameterHandler->findGroup(sParameterGroup, true);
+	if (!pGroup->hasParameter(sParameterName))
+		throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_PARAMETERNOTFOUND);
+
+	pGroup->setParameterValueByName(sParameterName, AMCCommon::CUtils::normalizeUUIDString (sValue));
+}
+
+
 void CStateEnvironment::SetDoubleParameter(const std::string& sParameterGroup, const std::string& sParameterName, const LibMCEnv_double dValue)
 {
 	if (!m_pParameterHandler->hasGroup(sParameterGroup))
@@ -346,6 +374,19 @@ std::string CStateEnvironment::GetStringParameter(const std::string& sParameterG
 	return pGroup->getParameterValueByName(sParameterName);
 }
 
+
+std::string CStateEnvironment::GetUUIDParameter(const std::string& sParameterGroup, const std::string& sParameterName)
+{
+	if (!m_pParameterHandler->hasGroup(sParameterGroup))
+		throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_PARAMETERGROUPNOTFOUND);
+
+	auto pGroup = m_pParameterHandler->findGroup(sParameterGroup, true);
+	if (!pGroup->hasParameter(sParameterName))
+		throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_PARAMETERNOTFOUND);
+
+	return AMCCommon::CUtils::normalizeUUIDString (pGroup->getParameterValueByName(sParameterName));
+}
+
 LibMCEnv_double CStateEnvironment::GetDoubleParameter(const std::string& sParameterGroup, const std::string& sParameterName)
 {
 	if (!m_pParameterHandler->hasGroup(sParameterGroup))
diff --git a/Implementation/LibMCEnv/libmcenv_stateenvironment.hpp b/Implementation/LibMCEnv/libmcenv_stateenvironment.hpp
index ce9c177d..e280eb02 100644
--- a/Implementation/LibMCEnv/libmcenv_stateenvironment.hpp
+++ b/Implementation/LibMCEnv/libmcenv_stateenvironment.hpp
@@ -34,6 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "libmcenv_interfaces.hpp"
 #include "amc_systemstate.hpp"
+#include "amc_parameterhandler.hpp"
 
 // Parent classes
 #include "libmcenv_base.hpp"
@@ -70,20 +71,14 @@ class CStateEnvironment : public virtual IStateEnvironment, public virtual CBase
 
 	CStateEnvironment(AMC::PSystemState pSystemState, AMC::PParameterHandler pParameterHandler, std::string sInstanceName);
 
-	ISignalTrigger* CreateSignal(const std::string& sMachineInstance, const std::string& sSignalName) override;
+	ISignalTrigger* PrepareSignal(const std::string& sMachineInstance, const std::string& sSignalName) override;
 
 	bool WaitForSignal(const std::string& sSignalName, const LibMCEnv_uint32 nTimeOut, ISignalHandler*& pHandlerInstance) override;
 
-	void LoadToolpath(const std::string& sToolpathUUID) override;
-
-	void UnloadToolpath(const std::string& sToolpathUUID) override;
+	IBuild* GetBuildJob(const std::string& sBuildUUID) override;
 
 	void UnloadAllToolpathes() override;
 
-	bool ToolpathIsLoaded(const std::string& sToolpathUUID) override;
-
-	IToolpathAccessor* CreateToolpathAccessor(const std::string& sToolpathUUID) override;
-
 	void GetDriverLibrary(const std::string& sDriverName, std::string& sDriverType, LibMCEnv_pvoid& pDriverLookup) override;
 
 	void CreateDriverAccess(const std::string& sDriverName, LibMCEnv_pvoid& pDriverHandle) override;
@@ -102,30 +97,36 @@ class CStateEnvironment : public virtual IStateEnvironment, public virtual CBase
 
 	bool CheckForTermination() override;
 
-	void StoreString(const std::string& sName, const std::string& sValue);
+	void StoreString(const std::string& sName, const std::string& sValue) override;
+
+	void StoreUUID(const std::string& sName, const std::string& sValue) override;
 
-	void StoreInteger(const std::string& sName, const LibMCEnv_int64 nValue);
+	void StoreInteger(const std::string& sName, const LibMCEnv_int64 nValue) override;
 
-	void StoreDouble(const std::string& sName, const LibMCEnv_double dValue);
+	void StoreDouble(const std::string& sName, const LibMCEnv_double dValue) override;
 
-	void StoreBool(const std::string& sName, const bool bValue);
+	void StoreBool(const std::string& sName, const bool bValue) override;
 
-	void StoreSignal(const std::string& sName, ISignalHandler* pHandler);
+	void StoreSignal(const std::string& sName, ISignalHandler* pHandler) override;
 
-	std::string RetrieveString(const std::string& sName);
+	std::string RetrieveString(const std::string& sName) override;
 
-	LibMCEnv_int64 RetrieveInteger(const std::string& sName);
+	std::string RetrieveUUID(const std::string& sName) override;
 
-	LibMCEnv_double RetrieveDouble(const std::string& sName);
+	LibMCEnv_int64 RetrieveInteger(const std::string& sName) override;
 
-	bool RetrieveBool(const std::string& sName);
+	LibMCEnv_double RetrieveDouble(const std::string& sName) override;
 
-	ISignalHandler* RetrieveSignal(const std::string& sName);
+	bool RetrieveBool(const std::string& sName) override;
 
-	void ClearStoredValue(const std::string& sName);
+	ISignalHandler* RetrieveSignal(const std::string& sName) override;
+
+	void ClearStoredValue(const std::string& sName) override;
 
 	void SetStringParameter(const std::string& sParameterGroup, const std::string& sParameterName, const std::string& sValue) override;
 
+	void SetUUIDParameter(const std::string& sParameterGroup, const std::string& sParameterName, const std::string& sValue) override;
+
 	void SetDoubleParameter(const std::string& sParameterGroup, const std::string& sParameterName, const LibMCEnv_double dValue) override;
 
 	void SetIntegerParameter(const std::string& sParameterGroup, const std::string& sParameterName, const LibMCEnv_int64 nValue) override;
@@ -134,6 +135,8 @@ class CStateEnvironment : public virtual IStateEnvironment, public virtual CBase
 
 	std::string GetStringParameter(const std::string& sParameterGroup, const std::string& sParameterName) override;
 
+	std::string GetUUIDParameter(const std::string& sParameterGroup, const std::string& sParameterName) override;
+
 	LibMCEnv_double GetDoubleParameter(const std::string& sParameterGroup, const std::string& sParameterName) override;
 
 	LibMCEnv_int64 GetIntegerParameter(const std::string& sParameterGroup, const std::string& sParameterName) override;
diff --git a/Implementation/LibMCEnv/libmcenv_toolpathaccessor.cpp b/Implementation/LibMCEnv/libmcenv_toolpathaccessor.cpp
index 63e6f65b..3da1a234 100644
--- a/Implementation/LibMCEnv/libmcenv_toolpathaccessor.cpp
+++ b/Implementation/LibMCEnv/libmcenv_toolpathaccessor.cpp
@@ -42,8 +42,8 @@ using namespace LibMCEnv::Impl;
  Class definition of CToolpathAccessor 
 **************************************************************************************************************************/
 
-CToolpathAccessor::CToolpathAccessor(const std::string& sUUID, AMC::PToolpathHandler pToolpathHandler)
-	: m_sUUID(sUUID), m_pToolpathHandler(pToolpathHandler)
+CToolpathAccessor::CToolpathAccessor(const std::string& sStorageUUID, AMC::PToolpathHandler pToolpathHandler)
+	: m_sStorageUUID(sStorageUUID), m_pToolpathHandler(pToolpathHandler)
 {
 	if (pToolpathHandler.get() == nullptr)
 		throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDPARAM);
@@ -53,22 +53,27 @@ CToolpathAccessor::~CToolpathAccessor()
 {
 }
 
-std::string CToolpathAccessor::GetUUID()
+std::string CToolpathAccessor::GetStorageUUID()
 {
-	return m_sUUID;
+	return m_sStorageUUID;
 }
 
 LibMCEnv_uint32 CToolpathAccessor::GetLayerCount()
 {
-	auto pToolpathEntity = m_pToolpathHandler->findToolpathEntity(m_sUUID, true);
+	auto pToolpathEntity = m_pToolpathHandler->findToolpathEntity(m_sStorageUUID, true);
 	return pToolpathEntity->getLayerCount();
 
 }
 
 IToolpathLayer * CToolpathAccessor::LoadLayer(const LibMCEnv_uint32 nLayerIndex)
 {
-	auto pToolpathEntity = m_pToolpathHandler->findToolpathEntity(m_sUUID, true);
+	auto pToolpathEntity = m_pToolpathHandler->findToolpathEntity(m_sStorageUUID, true);
 
 	return new CToolpathLayer(pToolpathEntity->readLayer (nLayerIndex));
 }
 
+LibMCEnv_double CToolpathAccessor::GetUnits()
+{
+	auto pToolpathEntity = m_pToolpathHandler->findToolpathEntity(m_sStorageUUID, true);
+	return pToolpathEntity->getUnits();
+}
diff --git a/Implementation/LibMCEnv/libmcenv_toolpathaccessor.hpp b/Implementation/LibMCEnv/libmcenv_toolpathaccessor.hpp
index ac8b6598..190b47df 100644
--- a/Implementation/LibMCEnv/libmcenv_toolpathaccessor.hpp
+++ b/Implementation/LibMCEnv/libmcenv_toolpathaccessor.hpp
@@ -58,20 +58,22 @@ class CToolpathAccessor : public virtual IToolpathAccessor, public virtual CBase
 
 protected:
 
-	std::string m_sUUID;
+	std::string m_sStorageUUID;
 	AMC::PToolpathHandler m_pToolpathHandler;
 
 
 public:
-	CToolpathAccessor(const std::string& sUUID, AMC::PToolpathHandler pToolpathHandler);
+	CToolpathAccessor(const std::string& sStorageUUID, AMC::PToolpathHandler pToolpathHandler);
 	virtual ~CToolpathAccessor();
 
-	std::string GetUUID() override;
+	std::string GetStorageUUID() override;
 
 	LibMCEnv_uint32 GetLayerCount() override;
 
 	IToolpathLayer * LoadLayer(const LibMCEnv_uint32 nLayerIndex) override;
 
+	LibMCEnv_double GetUnits() override;
+
 };
 
 } // namespace Impl
diff --git a/Implementation/LibMCEnv/libmcenv_toolpathlayer.cpp b/Implementation/LibMCEnv/libmcenv_toolpathlayer.cpp
index a9daba23..b070ddb1 100644
--- a/Implementation/LibMCEnv/libmcenv_toolpathlayer.cpp
+++ b/Implementation/LibMCEnv/libmcenv_toolpathlayer.cpp
@@ -74,6 +74,18 @@ std::string CToolpathLayer::GetSegmentPartUUID(const LibMCEnv_uint32 nIndex)
 	return m_pToolpathLayerData->getSegmentPartUUID(nIndex);
 }
 
+std::string CToolpathLayer::GetSegmentProfileValue(const std::string& sValueName)
+{
+	return "";
+}
+
+LibMCEnv_double CToolpathLayer::GetSegmentProfileTypedValue(const LibMCEnv::eToolpathProfileValueType eValueType)
+{
+	return 0.0;
+}
+
+
+
 void CToolpathLayer::GetSegmentPointData(const LibMCEnv_uint32 nIndex, LibMCEnv_uint64 nPointDataBufferSize, LibMCEnv_uint64* pPointDataNeededCount, LibMCEnv::sPosition2D * pPointDataBuffer)
 {
 
@@ -89,3 +101,12 @@ void CToolpathLayer::GetSegmentPointData(const LibMCEnv_uint32 nIndex, LibMCEnv_
 	}
 }
 
+LibMCEnv_double CToolpathLayer::GetUnits()
+{
+	return m_pToolpathLayerData->getUnits();
+}
+
+LibMCEnv_int32 CToolpathLayer::GetZValue()
+{
+	return m_pToolpathLayerData->getZValue();
+}
diff --git a/Implementation/LibMCEnv/libmcenv_toolpathlayer.hpp b/Implementation/LibMCEnv/libmcenv_toolpathlayer.hpp
index 74efd71d..8fcc4db3 100644
--- a/Implementation/LibMCEnv/libmcenv_toolpathlayer.hpp
+++ b/Implementation/LibMCEnv/libmcenv_toolpathlayer.hpp
@@ -74,8 +74,16 @@ class CToolpathLayer : public virtual IToolpathLayer, public virtual CBase {
 
 	std::string GetSegmentPartUUID(const LibMCEnv_uint32 nIndex) override;
 
+	std::string GetSegmentProfileValue(const std::string& sValueName) override;
+
+	LibMCEnv_double GetSegmentProfileTypedValue(const LibMCEnv::eToolpathProfileValueType eValueType) override;
+
 	void GetSegmentPointData(const LibMCEnv_uint32 nIndex, LibMCEnv_uint64 nPointDataBufferSize, LibMCEnv_uint64* pPointDataNeededCount, LibMCEnv::sPosition2D * pPointDataBuffer) override;
 
+	LibMCEnv_int32 GetZValue() override;
+
+	LibMCEnv_double GetUnits() override;
+
 };
 
 } // namespace Impl
diff --git a/Implementation/UI/amc_ui_handler.cpp b/Implementation/UI/amc_ui_handler.cpp
new file mode 100644
index 00000000..4bb08e10
--- /dev/null
+++ b/Implementation/UI/amc_ui_handler.cpp
@@ -0,0 +1,191 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#define __AMCIMPL_UI_MENUITEM
+#define __AMCIMPL_UI_TOOLBARITEM
+#define __AMCIMPL_API_CONSTANTS
+
+#include "amc_ui_handler.hpp"
+#include "amc_ui_menuitem.hpp"
+#include "amc_ui_toolbaritem.hpp"
+#include "amc_jsonwriter.hpp"
+
+#include "amc_api_constants.hpp"
+
+#include "libmc_interfaceexception.hpp"
+
+#include "PugiXML/pugixml.hpp"
+
+using namespace AMC;
+
+CUIHandler::CUIHandler()
+{
+
+}
+
+CUIHandler::~CUIHandler()
+{
+
+}
+
+std::string CUIHandler::getAppName()
+{
+	return m_sAppName;
+}
+
+std::string CUIHandler::getCopyrightString()
+{
+	return m_sCopyrightString;
+}
+
+void CUIHandler::addMenuItem(const std::string& sID, const std::string& sIcon, const std::string& sCaption, const std::string& sTargetPage)
+{
+	m_MenuItems.push_back(std::make_shared<CUIMenuItem> (sID, sIcon, sCaption));
+}
+
+void CUIHandler::addToolbarItem(const std::string& sID, const std::string& sIcon, const std::string& sCaption, const std::string& sTargetPage)
+{
+	m_ToolbarItems.push_back(std::make_shared<CUIToolbarItem> (sID, sIcon, sCaption));
+}
+
+
+void CUIHandler::writeToJSON(CJSONWriter& writer)
+{
+	writer.addString(AMC_API_KEY_UI_APPNAME, m_sAppName);
+	writer.addString(AMC_API_KEY_UI_COPYRIGHT, m_sCopyrightString);
+	//writer.addString(AMC_API_KEY_UI_MAINPAGE, m_);
+
+	CJSONWriterArray menuItems(writer);
+
+	for (auto iter : m_MenuItems) {
+		CJSONWriterObject menuItem(writer);
+		menuItem.addString(AMC_API_KEY_UI_ID, iter->getID ());
+		menuItem.addString(AMC_API_KEY_UI_ICON, iter->getIcon ());
+		menuItem.addString(AMC_API_KEY_UI_CAPTION, iter->getCaption ());
+		//menuItem.addString(AMC_API_KEY_UI_TARGETPAGE, "main");
+		menuItems.addObject(menuItem);
+	}
+
+	writer.addArray(AMC_API_KEY_UI_MENUITEMS, menuItems);
+
+	CJSONWriterArray toolbarItems(writer);
+
+	for (auto iter : m_ToolbarItems) {
+		CJSONWriterObject toolbarItem(writer);
+		toolbarItem.addString(AMC_API_KEY_UI_ID, iter->getID());
+		toolbarItem.addString(AMC_API_KEY_UI_ICON, iter->getIcon());
+		toolbarItem.addString(AMC_API_KEY_UI_CAPTION, iter->getCaption());
+		//menuItem.addString(AMC_API_KEY_UI_TARGETPAGE, "main");
+		toolbarItems.addObject(toolbarItem);
+	}
+	writer.addArray(AMC_API_KEY_UI_TOOLBARITEMS, toolbarItems);
+
+}
+
+PUIPage CUIHandler::addPage(const std::string& sInstanceName, const std::string& sName)    
+{
+    //auto pPage = std::make_shared<CUIPage> ();
+
+    return nullptr;
+}
+
+
+void CUIHandler::loadFromXML(pugi::xml_node& xmlNode)
+{
+    m_sAppName = "";
+    m_sCopyrightString = "";
+    m_ToolbarItems.clear();
+    m_MenuItems.clear();
+
+    auto appnameAttrib = xmlNode.attribute("appname");
+    if (appnameAttrib.empty())
+        throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGAPPNAME);
+    m_sAppName = appnameAttrib.as_string();
+
+    auto copyrightAttrib = xmlNode.attribute("copyright");
+    if (copyrightAttrib.empty())
+        throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGCOPYRIGHT);
+    m_sCopyrightString = copyrightAttrib.as_string();
+
+    auto mainpageAttrib = xmlNode.attribute("mainpage");
+    if (mainpageAttrib.empty())
+        throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGMAINPAGE);
+    std::string sMainPage(mainpageAttrib.as_string());
+
+    auto menuNode = xmlNode.child("menu");
+    if (menuNode.empty())
+        throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGMENUNODE);
+
+    auto menuItems = menuNode.children("item");
+    for (pugi::xml_node menuItem : menuItems) {
+        auto idAttrib = menuItem.attribute("id");
+        if (idAttrib.empty())
+            throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGMENUITEMID);
+
+        auto iconAttrib = menuItem.attribute("icon");
+        if (iconAttrib.empty())
+            throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGMENUITEMICON);
+
+        auto captionAttrib = menuItem.attribute("caption");
+        if (captionAttrib.empty())
+            throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGMENUITEMCAPTION);
+
+        auto targetPageAttrib = menuItem.attribute("targetpage");
+        if (targetPageAttrib.empty())
+            throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGTARGETPAGE);
+
+        addMenuItem(idAttrib.as_string(), iconAttrib.as_string(), captionAttrib.as_string(), targetPageAttrib.as_string());
+    }
+
+    auto toolbarNode = xmlNode.child("toolbar");
+    if (toolbarNode.empty())
+        throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGTOOLBARNODE);
+
+    auto toolbarItems = toolbarNode.children("item");
+    for (pugi::xml_node toolbarItem : toolbarItems) {
+        auto idAttrib = toolbarItem.attribute("id");
+        if (idAttrib.empty())
+            throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGTOOLBARITEMID);
+
+        auto iconAttrib = toolbarItem.attribute("icon");
+        if (iconAttrib.empty())
+            throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGTOOLBARITEMICON);
+
+        auto captionAttrib = toolbarItem.attribute("caption");
+        if (captionAttrib.empty())
+            throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGTOOLBARITEMCAPTION);
+
+        auto targetPageAttrib = toolbarItem.attribute("targetpage");
+        if (targetPageAttrib.empty())
+            throw ELibMCInterfaceException(LIBMC_ERROR_MISSINGTARGETPAGE);
+
+        addToolbarItem(idAttrib.as_string(), iconAttrib.as_string(), captionAttrib.as_string(), targetPageAttrib.as_string());
+    }
+}
\ No newline at end of file
diff --git a/Implementation/UI/amc_ui_handler.hpp b/Implementation/UI/amc_ui_handler.hpp
new file mode 100644
index 00000000..e59cbb8a
--- /dev/null
+++ b/Implementation/UI/amc_ui_handler.hpp
@@ -0,0 +1,84 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_UI_HANDLER
+#define __AMC_UI_HANDLER
+
+#include "header_protection.hpp"
+#include "header_pugixml.hpp"
+
+#include <memory>
+#include <vector>
+#include <string>
+
+namespace AMC {
+
+	amcDeclareDependingClass(CUIMenuItem, PUIMenuItem);
+	amcDeclareDependingClass(CUIToolbarItem, PUIToolbarItem);
+	amcDeclareDependingClass(CJSONWriter, PJSONWriter);
+	amcDeclareDependingClass(CUIPage, PUIPage);
+
+	class CUIHandler {
+	protected:
+		std::string m_sAppName;
+		std::string m_sCopyrightString;
+
+		std::vector <PUIMenuItem> m_MenuItems;
+		std::vector <PUIToolbarItem> m_ToolbarItems;
+
+		std::map <std::pair<std::string, std::string>, PUIPage> m_Pages;
+
+	public:
+
+		CUIHandler();
+		
+		virtual ~CUIHandler();
+		
+		std::string getAppName();
+		std::string getCopyrightString();
+
+		void addMenuItem (const std::string & sID, const std::string & sIcon, const std::string & sCaption, const std::string & sTargetPage);
+		void addToolbarItem(const std::string& sID, const std::string& sIcon, const std::string& sCaption, const std::string& sTargetPage);
+
+		PUIPage addPage(const std::string& sInstanceName, const std::string& sName);
+
+		void writeToJSON (CJSONWriter & writer);
+
+		void loadFromXML (pugi::xml_node & xmlNode);
+	};
+	
+	typedef std::shared_ptr<CUIHandler> PUIHandler;
+	
+}
+
+
+#endif //__AMC_UI_HANDLER
+
diff --git a/Implementation/UI/amc_ui_menuitem.cpp b/Implementation/UI/amc_ui_menuitem.cpp
new file mode 100644
index 00000000..e12d4479
--- /dev/null
+++ b/Implementation/UI/amc_ui_menuitem.cpp
@@ -0,0 +1,63 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#define __AMCIMPL_UI_MENUITEM
+
+#include "amc_ui_menuitem.hpp"
+#include "libmc_interfaceexception.hpp"
+
+
+using namespace AMC;
+
+CUIMenuItem::CUIMenuItem(const std::string& sID, const std::string& sIcon, const std::string& sCaption)
+	: m_sID (sID), m_sIcon (sIcon), m_sCaption (sCaption)
+{
+
+}
+
+CUIMenuItem::~CUIMenuItem()
+{
+
+}
+
+std::string CUIMenuItem::getID()
+{
+	return m_sID;
+}
+
+std::string CUIMenuItem::getIcon()
+{
+	return m_sIcon;
+}
+
+std::string CUIMenuItem::getCaption()
+{
+	return m_sCaption;
+}
diff --git a/Implementation/UI/amc_ui_menuitem.hpp b/Implementation/UI/amc_ui_menuitem.hpp
new file mode 100644
index 00000000..b9548dc3
--- /dev/null
+++ b/Implementation/UI/amc_ui_menuitem.hpp
@@ -0,0 +1,67 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_UI_MENUITEM
+#define __AMC_UI_MENUITEM
+
+#include "header_protection.hpp"
+
+#ifndef __AMCIMPL_UI_MENUITEM
+#error this header is protected and should only be included in the corresponding implementation CPP files.
+#endif
+
+namespace AMC {
+
+	class CUIMenuItem {
+	protected:
+		std::string m_sID;
+		std::string m_sIcon;
+		std::string m_sCaption;
+		
+	public:
+
+		CUIMenuItem(const std::string & sID, const std::string & sIcon, const std::string & sCaption);		
+		
+		virtual ~CUIMenuItem();
+						
+		std::string getID ();
+		std::string getIcon ();
+		std::string getCaption ();
+				
+	};
+	
+	typedef std::shared_ptr<CUIMenuItem> PUIMenuItem;
+	
+}
+
+
+#endif //__AMC_UI_MENUITEM
+
diff --git a/Implementation/UI/amc_ui_module.cpp b/Implementation/UI/amc_ui_module.cpp
new file mode 100644
index 00000000..d470e00e
--- /dev/null
+++ b/Implementation/UI/amc_ui_module.cpp
@@ -0,0 +1,48 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#define __AMCIMPL_UI_MODULE
+
+#include "amc_ui_module.hpp"
+#include "libmc_interfaceexception.hpp"
+
+
+using namespace AMC;
+
+CUIModule::CUIModule(const std::string& sName)
+	: m_sName (sName)
+{
+
+}
+
+CUIModule::~CUIModule()
+{
+
+}
diff --git a/Implementation/UI/amc_ui_module.hpp b/Implementation/UI/amc_ui_module.hpp
new file mode 100644
index 00000000..4ba3f2b5
--- /dev/null
+++ b/Implementation/UI/amc_ui_module.hpp
@@ -0,0 +1,61 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_UI_MODULE
+#define __AMC_UI_MODULE
+
+#include "header_protection.hpp"
+
+#ifndef __AMCIMPL_UI_MODULE
+#error this header is protected and should only be included in the corresponding implementation CPP files.
+#endif
+
+namespace AMC {
+
+	class CUIModule {
+	protected:
+		std::string m_sName;
+		
+	public:
+
+		CUIModule(const std::string & sName);	
+		
+		virtual ~CUIModule();
+										
+	};
+	
+	typedef std::shared_ptr<CUIModule> PUIModule;
+	
+}
+
+
+#endif //__AMC_UI_MODULE
+
diff --git a/Implementation/LibMC/libmc_apiresponse.cpp b/Implementation/UI/amc_ui_page.cpp
similarity index 52%
rename from Implementation/LibMC/libmc_apiresponse.cpp
rename to Implementation/UI/amc_ui_page.cpp
index b7b6bc4b..e260768d 100644
--- a/Implementation/LibMC/libmc_apiresponse.cpp
+++ b/Implementation/UI/amc_ui_page.cpp
@@ -28,62 +28,27 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "libmc_apiresponse.hpp"
-#include "libmc_interfaceexception.hpp"
+#define __AMCIMPL_UI_PAGE
 
-// Include custom headers here.
+#include "amc_ui_page.hpp"
+#include "libmc_interfaceexception.hpp"
 
 
-using namespace LibMC::Impl;
+using namespace AMC;
 
-/*************************************************************************************************************************
- Class definition of CAPIResponse 
-**************************************************************************************************************************/
 
-CAPIResponse::CAPIResponse(AMC::PAPIResponse pResponse, uint32_t nErrorCode)
-	: m_pResponse (pResponse), m_nErrorCode (nErrorCode)
+CUIPage::CUIPage(const std::string& sInstanceName, const std::string& sName)
+	: m_sInstanceName (sInstanceName), m_sName(sName)
 {
-	if (pResponse.get() == nullptr)
+	if (sInstanceName.empty())
+		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
+	if (sName.empty())
 		throw ELibMCInterfaceException(LIBMC_ERROR_INVALIDPARAM);
-}
-
-
-LibMC_uint32 CAPIResponse::GetHTTPCode()
-{
-	return m_nErrorCode;
-}
 
-std::string CAPIResponse::GetContentType()
-{
-	if (m_pResponse.get() != nullptr)
-		return m_pResponse->getContentType();
 
-	return "";
 }
 
-void CAPIResponse::GetData(LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer)
+CUIPage::~CUIPage()
 {
-	uint64_t nStreamSize = 0;
-	if (m_pResponse.get() != nullptr)
-		nStreamSize = (uint64_t)m_pResponse->getStreamSize();
-
-	if (pDataNeededCount != nullptr) {
-		*pDataNeededCount = nStreamSize;
-	}
-
-	if (pDataBuffer != nullptr) {
 
-		if (nDataBufferSize < nStreamSize)
-			throw ELibMCInterfaceException(LIBMC_ERROR_BUFFERTOOSMALL);
-
-		if (m_pResponse.get() != nullptr) {
-			const uint8_t * pSrc = m_pResponse->getStreamData();
-			uint8_t * pDst = pDataBuffer;
-
-			for (uint64_t nIndex = 0; nIndex < nStreamSize; nIndex++) {
-				*pDst = *pSrc; pDst++; pSrc++;
-			}
-		}
-	}
 }
-
diff --git a/Implementation/UI/amc_ui_page.hpp b/Implementation/UI/amc_ui_page.hpp
new file mode 100644
index 00000000..5f04f3fa
--- /dev/null
+++ b/Implementation/UI/amc_ui_page.hpp
@@ -0,0 +1,62 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_UI_PAGE
+#define __AMC_UI_PAGE
+
+#include "header_protection.hpp"
+
+#ifndef __AMCIMPL_UI_PAGE
+#error this header is protected and should only be included in the corresponding implementation CPP files.
+#endif
+
+namespace AMC {
+
+	class CUIPage {
+	protected:
+		std::string m_sInstanceName;
+		std::string m_sName;
+
+	public:
+
+		CUIPage(const std::string& sInstanceName, const std::string & sName);
+		
+		virtual ~CUIPage();
+										
+	};
+	
+	typedef std::shared_ptr<CUIPage> PUIPage;
+	
+}
+
+
+#endif //__AMC_UI_MENUITEM
+
diff --git a/Implementation/UI/amc_ui_toolbaritem.cpp b/Implementation/UI/amc_ui_toolbaritem.cpp
new file mode 100644
index 00000000..fc7eca33
--- /dev/null
+++ b/Implementation/UI/amc_ui_toolbaritem.cpp
@@ -0,0 +1,63 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#define __AMCIMPL_UI_TOOLBARITEM
+
+#include "amc_ui_toolbaritem.hpp"
+#include "libmc_interfaceexception.hpp"
+
+
+using namespace AMC;
+
+CUIToolbarItem::CUIToolbarItem(const std::string& sID, const std::string& sIcon, const std::string& sCaption)
+	: m_sID (sID), m_sIcon (sIcon), m_sCaption (sCaption)
+{
+
+}
+
+CUIToolbarItem::~CUIToolbarItem()
+{
+
+}
+
+std::string CUIToolbarItem::getID()
+{
+	return m_sID;
+}
+
+std::string CUIToolbarItem::getIcon()
+{
+	return m_sIcon;
+}
+
+std::string CUIToolbarItem::getCaption()
+{
+	return m_sCaption;
+}
diff --git a/Implementation/UI/amc_ui_toolbaritem.hpp b/Implementation/UI/amc_ui_toolbaritem.hpp
new file mode 100644
index 00000000..a5fcaf02
--- /dev/null
+++ b/Implementation/UI/amc_ui_toolbaritem.hpp
@@ -0,0 +1,67 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef __AMC_UI_TOOLBARITEM
+#define __AMC_UI_TOOLBARITEM
+
+#include "header_protection.hpp"
+
+#ifndef __AMCIMPL_UI_TOOLBARITEM
+#error this header is protected and should only be included in the corresponding implementation CPP files.
+#endif
+
+namespace AMC {
+
+	class CUIToolbarItem {
+	protected:
+		std::string m_sID;
+		std::string m_sIcon;
+		std::string m_sCaption;
+		
+	public:
+
+		CUIToolbarItem(const std::string & sID, const std::string & sIcon, const std::string & sCaption);		
+		
+		virtual ~CUIToolbarItem();
+						
+		std::string getID ();
+		std::string getIcon ();
+		std::string getCaption ();
+				
+	};
+	
+	typedef std::shared_ptr<CUIToolbarItem> PUIToolbarItem;
+	
+}
+
+
+#endif //__AMC_UI_TOOLBARITEM
+
diff --git a/Libraries/SQLite/CMakeLists.txt b/Libraries/SQLite/CMakeLists.txt
index 193d31e0..cf8c3ae0 100644
--- a/Libraries/SQLite/CMakeLists.txt
+++ b/Libraries/SQLite/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.7)
 project(SQLite3
     VERSION   3.31.1
     LANGUAGES C
@@ -11,4 +11,4 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
     OUTPUT_NAME   sqlite3
     PUBLIC_HEADER sqlite3.h
     DEBUG_POSTFIX d
-    )
\ No newline at end of file
+    )
diff --git a/Libraries/SQLite/libsqlite3.a b/Libraries/SQLite/libsqlite3.a
index baca1f43..5ec4d601 100644
Binary files a/Libraries/SQLite/libsqlite3.a and b/Libraries/SQLite/libsqlite3.a differ
diff --git a/Libraries/crossguid/guid.hpp b/Libraries/crossguid/guid.hpp
index 649db761..7ecbbdc3 100644
--- a/Libraries/crossguid/guid.hpp
+++ b/Libraries/crossguid/guid.hpp
@@ -24,6 +24,10 @@ THE SOFTWARE.
 
 #pragma once
 
+#ifdef _WIN32
+#define GUID_WINDOWS
+#endif
+
 #ifdef GUID_ANDROID
 #include <thread>
 #include <jni.h>
diff --git a/Plugins/CMakeLists.txt b/Plugins/CMakeLists.txt
index b48c17d3..e857c28b 100644
--- a/Plugins/CMakeLists.txt
+++ b/Plugins/CMakeLists.txt
@@ -18,6 +18,6 @@ cmake_minimum_required(VERSION 3.5)
 project("AMCPlugins")
 
 add_subdirectory(Main)
-add_subdirectory(Laser)
-add_subdirectory(Movement)
+add_subdirectory(PrinterConnection)
+add_subdirectory(PIDControl)
 
diff --git a/Plugins/Laser/CMakeLists.txt b/Plugins/Laser/CMakeLists.txt
index ece5bcb4..401b8c31 100644
--- a/Plugins/Laser/CMakeLists.txt
+++ b/Plugins/Laser/CMakeLists.txt
@@ -60,14 +60,19 @@ set(CMAKE_CURRENT_DRIVERHEADER_DEV ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/H
 file(STRINGS ${PROJECT_BINARY_DIR}/../../githash.txt GLOBALGITHASH)
 message(STATUS "Global git hash: \"${GLOBALGITHASH}\"")
 
-file(GLOB LIBMCPLUGIN_SRC
-	${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
+file(GLOB LIBMCPLUGIN_FRAMEWORK
 	${CMAKE_CURRENT_PLUGIN_DIR}/*.cpp
 	${CMAKE_CURRENT_AUTOGENERATED_DIR}/libmcplugin_interfaceexception.cpp
 	${CMAKE_CURRENT_AUTOGENERATED_DIR}/libmcplugin_interfacewrapper.cpp
 )
 
-add_library(${PLUGINNAME} SHARED ${LIBMCPLUGIN_SRC})
+file(GLOB LIBMCPLUGIN_SRC
+	${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
+)
+
+source_group("framework" FILES ${LIBMCPLUGIN_FRAMEWORK} )
+source_group("source" FILES ${LIBMCPLUGIN_SRC} )
+add_library(${PLUGINNAME} SHARED ${LIBMCPLUGIN_SRC} ${LIBMCPLUGIN_FRAMEWORK})
 # Do not prefix the binary's name with "lib" on Unix systems:
 set_target_properties(${PLUGINNAME} PROPERTIES PREFIX "" IMPORT_PREFIX "" )
 # The following two properties are crucial to reduce the number of undesirably exported symbols
diff --git a/Plugins/Laser/mcplugin_laser.cpp b/Plugins/Laser/mcplugin_laser.cpp
index 985c9755..79bb4df0 100644
--- a/Plugins/Laser/mcplugin_laser.cpp
+++ b/Plugins/Laser/mcplugin_laser.cpp
@@ -176,7 +176,8 @@ class CLaserState_DrawLayer : public virtual CLaserState {
 		auto sJobUUID = pSignal->GetString("jobuuid");
 		auto nLayerIndex = pSignal->GetInteger("layerindex");
 
-		auto pToolpathAccessor = pStateEnvironment->CreateToolpathAccessor(sJobUUID);
+		auto pBuildJob = pStateEnvironment->GetBuildJob(sJobUUID);
+		auto pToolpathAccessor = pBuildJob->CreateToolpathAccessor();
 		auto pLayer = pToolpathAccessor->LoadLayer((uint32_t) nLayerIndex);
 
 		auto nSegmentCount = pLayer->GetSegmentCount();
diff --git a/Plugins/Main/CMakeLists.txt b/Plugins/Main/CMakeLists.txt
index 3fd6053e..26e675a9 100644
--- a/Plugins/Main/CMakeLists.txt
+++ b/Plugins/Main/CMakeLists.txt
@@ -54,18 +54,25 @@ set(CMAKE_CURRENT_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/Headers
 set(CMAKE_CURRENT_AUTOGENERATED_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/InterfacesDev)
 set(CMAKE_CURRENT_PLUGIN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/PluginCpp)
 set(CMAKE_CURRENT_OUTPUT_DIR ${PROJECT_BINARY_DIR}/../../Output)
+set(CMAKE_CURRENT_DRIVERHEADER_CORE ${PROJECT_BINARY_DIR}/../../DevPackage/Framework/HeadersDriver/CppDynamic)
+set(CMAKE_CURRENT_DRIVERHEADER_DEV ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/HeadersDriver/CppDynamic)
 
 file(STRINGS ${PROJECT_BINARY_DIR}/../../githash.txt GLOBALGITHASH)
 message(STATUS "Global git hash: \"${GLOBALGITHASH}\"")
 
-file(GLOB LIBMCPLUGIN_SRC
-	${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
+file(GLOB LIBMCPLUGIN_FRAMEWORK
 	${CMAKE_CURRENT_PLUGIN_DIR}/*.cpp
 	${CMAKE_CURRENT_AUTOGENERATED_DIR}/libmcplugin_interfaceexception.cpp
 	${CMAKE_CURRENT_AUTOGENERATED_DIR}/libmcplugin_interfacewrapper.cpp
 )
 
-add_library(${PLUGINNAME} SHARED ${LIBMCPLUGIN_SRC})
+file(GLOB LIBMCPLUGIN_SRC
+	${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
+)
+
+source_group("framework" FILES ${LIBMCPLUGIN_FRAMEWORK} )
+source_group("source" FILES ${LIBMCPLUGIN_SRC} )
+add_library(${PLUGINNAME} SHARED ${LIBMCPLUGIN_SRC} ${LIBMCPLUGIN_FRAMEWORK})
 # Do not prefix the binary's name with "lib" on Unix systems:
 set_target_properties(${PLUGINNAME} PROPERTIES PREFIX "" IMPORT_PREFIX "" )
 # The following two properties are crucial to reduce the number of undesirably exported symbols
@@ -78,6 +85,8 @@ target_include_directories(${PLUGINNAME} PRIVATE ${CMAKE_CURRENT_AUTOGENERATED_D
 target_include_directories(${PLUGINNAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories(${PLUGINNAME} PRIVATE ${CMAKE_CURRENT_PLUGIN_DIR})
 target_include_directories(${PLUGINNAME} PRIVATE ${CMAKE_CURRENT_HEADER_DIR})
+target_include_directories(${PLUGINNAME} PRIVATE ${CMAKE_CURRENT_DRIVERHEADER_CORE})
+target_include_directories(${PLUGINNAME} PRIVATE ${CMAKE_CURRENT_DRIVERHEADER_DEV})
 
 set_target_properties(${PLUGINNAME}
     PROPERTIES
@@ -93,5 +102,8 @@ set_target_properties(${PLUGINNAME}
 
 
 ##########################################################################################
-### Add custom code below
-##########################################################################################
+### Add dependencies for drivers below
+###########################################################################################
+if (TARGET libmcdriver_marlin) 
+	add_dependencies (${PLUGINNAME} libmcdriver_marlin)
+endif()
diff --git a/Plugins/Main/mcplugin_main.cpp b/Plugins/Main/mcplugin_main.cpp
index 99ac3e2d..70710981 100644
--- a/Plugins/Main/mcplugin_main.cpp
+++ b/Plugins/Main/mcplugin_main.cpp
@@ -34,6 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using namespace LibMCPlugin::Impl;
 
+//#include "libmcdriver_camera_dynamic.hpp"
+#include "libmcenv_drivercast.hpp"
 
 #ifdef _MSC_VER
 #pragma warning(push)
@@ -41,10 +43,26 @@ using namespace LibMCPlugin::Impl;
 #endif
 
 /*************************************************************************************************************************
- Class definition of CLaserData
+ Import functionality for Driver into current plugin
+**************************************************************************************************************************/
+//typedef LibMCDriver_Camera::PDriver_RaspiCamera PDriver_RaspiCamera;
+//typedef LibMCEnv::CDriverCast <LibMCDriver_Camera::CDriver_RaspiCamera, LibMCDriver_Camera::CWrapper> PDriverCast_RaspiCamera;
+
+/*************************************************************************************************************************
+ Class definition of CMainData
 **************************************************************************************************************************/
 class CMainData : public virtual CPluginData {
+protected:
+	// We need to globally store driver wrappers in the plugin
+	//PDriverCast_RaspiCamera m_DriverCast_RaspiCamera;
+
 public:
+
+	//PDriver_RaspiCamera acquireCameraDriver(LibMCEnv::PStateEnvironment pStateEnvironment)
+	//{
+	//	return m_DriverCast_RaspiCamera.acquireDriver(pStateEnvironment, "camera");
+	//}
+
 };
 
 /*************************************************************************************************************************
@@ -80,8 +98,6 @@ class CMainState_Init : public virtual CMainState {
 
 		pStateEnvironment->LogMessage("Initializing...");
 
-		pStateEnvironment->SetStringParameter("jobinfo", "jobname", "TestJob");
-		pStateEnvironment->SetStringParameter("jobinfo", "jobuuid", "6b77d4ef-3a05-4b88-bb1f-3f1583e18c5c");
 		pStateEnvironment->SetIntegerParameter("jobinfo", "layercount", 0);
 		pStateEnvironment->SetIntegerParameter("jobinfo", "currentlayer", 0);
 		pStateEnvironment->SetBoolParameter("jobinfo", "printinprogress", false);
@@ -115,11 +131,46 @@ class CMainState_Idle : public virtual CMainState {
 		if (pStateEnvironment.get() == nullptr)
 			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
 
+
+		LibMCEnv::PSignalHandler pHandlerInstance;
 		if (pStateEnvironment->GetBoolParameter("jobinfo", "autostart")) {
 			pStateEnvironment->SetNextState("startprocess");
+
 		}
 		else {
-			pStateEnvironment->SetNextState("idle");
+			if (pStateEnvironment->WaitForSignal("signal_startjob", 0, pHandlerInstance)) {
+
+				pStateEnvironment->LogMessage("Starting job..");
+				try {
+					auto sJobName = pHandlerInstance->GetString("jobname");
+					auto	 sJobUUID = pHandlerInstance->GetString("jobuuid");
+
+					if (sJobName == "")
+						throw std::runtime_error ("empty job name!");
+					if (sJobName.length () > 64)
+						throw std::runtime_error("invalid job name: " + sJobName);
+
+					// Check if build job exists
+					pStateEnvironment->GetBuildJob(sJobUUID);
+
+					pStateEnvironment->SetStringParameter("jobinfo", "jobname", sJobName);
+					pStateEnvironment->SetUUIDParameter("jobinfo", "jobuuid", sJobUUID);
+					pHandlerInstance->SetBoolResult("success", true);
+
+					pStateEnvironment->SetNextState("startprocess");
+				}
+				catch (std::exception& E) {
+					pStateEnvironment->LogMessage (std::string ("Could not start job: ") + E.what ());
+					pHandlerInstance->SetBoolResult("success", false);
+					pStateEnvironment->SetNextState("idle");
+				}
+
+				pHandlerInstance->SignalHandled();
+
+			}
+			else {
+				pStateEnvironment->SetNextState("idle");
+			}
 		}
 
 	}
@@ -155,38 +206,41 @@ class CMainState_StartProcess : public virtual CMainState {
 
 		// Load Toolpath into memory
 		auto sJobUUID = pStateEnvironment->GetStringParameter("jobinfo", "jobuuid");
-		pStateEnvironment->LoadToolpath(sJobUUID);
+		auto pBuildJob = pStateEnvironment->GetBuildJob(sJobUUID);
+		pBuildJob->LoadToolpath();
 
 		// Find out layer count
-		auto pToolpathAccessor = pStateEnvironment->CreateToolpathAccessor(sJobUUID);
-		auto nLayerCount = pToolpathAccessor->GetLayerCount();
-
-		pStateEnvironment->SetIntegerParameter("jobinfo", "currentlayer", 1);
+		auto nLayerCount = pBuildJob->GetLayerCount();
+		
+		auto pSignal = pStateEnvironment->PrepareSignal("pidcontrol_extruder", "signal_startcontrolling");
+		pSignal->Trigger();
+		pSignal->WaitForHandling(10000);
+		
+		pStateEnvironment->SetIntegerParameter("jobinfo", "currentlayer", 0);
 		pStateEnvironment->SetIntegerParameter("jobinfo", "layercount", nLayerCount);
 		pStateEnvironment->SetBoolParameter("jobinfo", "autostart", false);
 		pStateEnvironment->SetBoolParameter("jobinfo", "printinprogress", true);
-		pStateEnvironment->SetNextState("coatlayer");
+		pStateEnvironment->SetNextState("waitfortemperature");
 	}
 
 };
 
 
-
 /*************************************************************************************************************************
- Class definition of CMainState_FinishProcess
+ Class definition of CMainState_WaitForTemperature
 **************************************************************************************************************************/
 
-class CMainState_FinishProcess : public virtual CMainState {
+class CMainState_WaitForTemperature : public virtual CMainState {
 public:
 
-	CMainState_FinishProcess(const std::string& sStateName, PPluginData pPluginData)
+	CMainState_WaitForTemperature(const std::string& sStateName, PPluginData pPluginData)
 		: CMainState(getStateName(), sStateName, pPluginData)
 	{
 	}
 
 	static const std::string getStateName()
 	{
-		return "finishprocess";
+		return "waitfortemperature";
 	}
 
 
@@ -195,15 +249,11 @@ class CMainState_FinishProcess : public virtual CMainState {
 		if (pStateEnvironment.get() == nullptr)
 			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
 
-		pStateEnvironment->LogMessage("Process finished");
+		pStateEnvironment->LogMessage("Wait for temperature...");
 
-		// Unload Toolpath from memory
-		auto sJobUUID = pStateEnvironment->GetStringParameter("jobinfo", "jobuuid");
-		pStateEnvironment->UnloadToolpath(sJobUUID);
-
-		pStateEnvironment->SetBoolParameter("jobinfo", "printinprogress", false);
-		pStateEnvironment->SetNextState("idle");
+		// TODO do something...
 
+		pStateEnvironment->SetNextState("extrudelayer");
 	}
 
 };
@@ -211,20 +261,20 @@ class CMainState_FinishProcess : public virtual CMainState {
 
 
 /*************************************************************************************************************************
- Class definition of CMainState_CoatLayer
+ Class definition of CMainState_FinishProcess
 **************************************************************************************************************************/
 
-class CMainState_CoatLayer : public virtual CMainState {
+class CMainState_FinishProcess : public virtual CMainState {
 public:
 
-	CMainState_CoatLayer(const std::string& sStateName, PPluginData pPluginData)
+	CMainState_FinishProcess(const std::string& sStateName, PPluginData pPluginData)
 		: CMainState(getStateName(), sStateName, pPluginData)
 	{
 	}
 
 	static const std::string getStateName()
 	{
-		return "coatlayer";
+		return "finishprocess";
 	}
 
 
@@ -233,53 +283,35 @@ class CMainState_CoatLayer : public virtual CMainState {
 		if (pStateEnvironment.get() == nullptr)
 			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
 
-		auto nCurrentLayer = pStateEnvironment->GetIntegerParameter("jobinfo", "currentlayer");
-
-		pStateEnvironment->LogMessage("Coating layer #" + std::to_string(nCurrentLayer) + "...");
-
-		auto pSignal = pStateEnvironment->CreateSignal("movement", "signal_recoatlayer");
-		pSignal->SetInteger("layerindex", nCurrentLayer);
-		pSignal->Trigger();
-
-		if (pSignal->WaitForHandling (20000)) {
-			auto bSuccess = pSignal->GetBoolResult("success");
+		pStateEnvironment->LogMessage("Process finished");
 
-			if (bSuccess) {
-				pStateEnvironment->LogMessage("Coating success. ");
-				pStateEnvironment->SetNextState("drawlayer");
-			}
-			else {
-				pStateEnvironment->LogMessage("Coating failure. ");
-				pStateEnvironment->SetNextState("fatalerror");
-			}
-		}
-		else {
+		// Unload Toolpath from memory
+		auto sJobUUID = pStateEnvironment->GetStringParameter("jobinfo", "jobuuid");
+		pStateEnvironment->GetBuildJob(sJobUUID)->UnloadToolpath ();
 
-			pStateEnvironment->LogMessage("Coating timeout!");
-			pStateEnvironment->SetNextState("fatalerror");
-		}		
+		pStateEnvironment->SetBoolParameter("jobinfo", "printinprogress", false);
+		pStateEnvironment->SetNextState("idle");
 
 	}
 
 };
 
 
-
 /*************************************************************************************************************************
- Class definition of CMainState_CoatLayer
+ Class definition of CMainState_ExtrudeLayer
 **************************************************************************************************************************/
 
-class CMainState_DrawLayer : public virtual CMainState {
+class CMainState_ExtrudeLayer : public virtual CMainState {
 public:
 
-	CMainState_DrawLayer(const std::string& sStateName, PPluginData pPluginData)
+	CMainState_ExtrudeLayer(const std::string& sStateName, PPluginData pPluginData)
 		: CMainState(getStateName(), sStateName, pPluginData)
 	{
 	}
 
 	static const std::string getStateName()
 	{
-		return "drawlayer";
+		return "extrudelayer";
 	}
 
 
@@ -288,36 +320,42 @@ class CMainState_DrawLayer : public virtual CMainState {
 		if (pStateEnvironment.get() == nullptr)
 			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
 
-		auto nCurrentLayer = pStateEnvironment->GetIntegerParameter("jobinfo", "currentlayer");
 		auto sJobUUID = pStateEnvironment->GetStringParameter("jobinfo", "jobuuid");
+		auto nCurrentLayer = pStateEnvironment->GetIntegerParameter("jobinfo", "currentlayer");
+		auto nLayerTimeoutGraceTime = pStateEnvironment->GetIntegerParameter("jobinfo", "layertimeoutgracetime");
+
+		if (nLayerTimeoutGraceTime < 0)
+			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
 
-		pStateEnvironment->LogMessage("Drawing layer #" + std::to_string(nCurrentLayer) + "...");
+		// TODO get/calc timeout (from layer length, given speed....)
+		int64_t nLayerTimeout = 200000;
 
-		auto pSignal = pStateEnvironment->CreateSignal ("laser", "signal_drawlayer");
+		pStateEnvironment->LogMessage("Extrude layer #" + std::to_string(nCurrentLayer) + "...");
+
+		auto pSignal = pStateEnvironment->PrepareSignal("movement", "signal_doextrudelayer");
+		pSignal->SetInteger("layertimeout", nLayerTimeout);
 		pSignal->SetInteger("layerindex", nCurrentLayer);
 		pSignal->SetString("jobuuid", sJobUUID);
 		pSignal->Trigger();
 
-		if (pSignal->WaitForHandling(20000)) {
+		if (pSignal->WaitForHandling((uint32_t) (nLayerTimeout + nLayerTimeoutGraceTime))) {
 			auto bSuccess = pSignal->GetBoolResult("success");
 
 			if (bSuccess) {
-				pStateEnvironment->LogMessage("Drawing success. ");
+				pStateEnvironment->LogMessage("Extruding success. ");
 				pStateEnvironment->SetNextState("nextlayer");
 			}
 			else {
-				pStateEnvironment->LogMessage("Drawing failure. ");
+				pStateEnvironment->LogMessage("Extruding failure. ");
 				pStateEnvironment->SetNextState("fatalerror");
 			}
 		}
 		else {
 
-			pStateEnvironment->LogMessage("Drawing timeout!");
+			pStateEnvironment->LogMessage("Extruding timeout!");
 			pStateEnvironment->SetNextState("fatalerror");
 		}
 
-		
-
 	}
 
 };
@@ -346,14 +384,24 @@ class CMainState_NextLayer : public virtual CMainState {
 		if (pStateEnvironment.get() == nullptr)
 			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
 
-
+		auto sJobUUID = pStateEnvironment->GetStringParameter("jobinfo", "jobuuid");
 		auto nCurrentLayer = pStateEnvironment->GetIntegerParameter("jobinfo", "currentlayer");
 		auto nLayerCount = pStateEnvironment->GetIntegerParameter("jobinfo", "layercount");
 
-		if (nCurrentLayer < nLayerCount) {
+		//pStateEnvironment->LogMessage("Getting Camera Image");
+		//auto pCameraDriver = m_pPluginData->acquireCameraDriver(pStateEnvironment);
+		//auto pPNGImage = pCameraDriver->CapturePNGImage();
+		//
+		//std::vector<uint8_t> Buffer;
+		//pPNGImage->GetRawData(Buffer);
+
+		auto pBuild = pStateEnvironment->GetBuildJob(sJobUUID);
+		//pBuild->AddBinaryData("image_layer_" + std::to_string(nCurrentLayer) + ".png", "image/png", Buffer);
+
+		if (nCurrentLayer < (nLayerCount - 1)) {
 			pStateEnvironment->LogMessage("Advancing to layer #" + std::to_string(nCurrentLayer + 1) + "...");
 			pStateEnvironment->SetIntegerParameter("jobinfo", "currentlayer", nCurrentLayer + 1);
-			pStateEnvironment->SetNextState("coatlayer");
+			pStateEnvironment->SetNextState("waitfortemperature");
 		}
 		else {
 			pStateEnvironment->LogMessage("Finishing process...");
@@ -429,13 +477,13 @@ IState * CStateFactory::CreateState(const std::string & sStateName)
 	if (createStateInstanceByName<CMainState_FinishProcess>(sStateName, pStateInstance, m_pPluginData))
 		return pStateInstance;
 
-	if (createStateInstanceByName<CMainState_CoatLayer>(sStateName, pStateInstance, m_pPluginData))
+	if (createStateInstanceByName<CMainState_ExtrudeLayer>(sStateName, pStateInstance, m_pPluginData))
 		return pStateInstance;
 
-	if (createStateInstanceByName<CMainState_DrawLayer>(sStateName, pStateInstance, m_pPluginData))
+	if (createStateInstanceByName<CMainState_NextLayer>(sStateName, pStateInstance, m_pPluginData))
 		return pStateInstance;
 
-	if (createStateInstanceByName<CMainState_NextLayer>(sStateName, pStateInstance, m_pPluginData))
+	if (createStateInstanceByName<CMainState_WaitForTemperature>(sStateName, pStateInstance, m_pPluginData))
 		return pStateInstance;
 
 	throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDSTATENAME);
diff --git a/Plugins/Movement/mcplugin_movement.cpp b/Plugins/Movement/mcplugin_movement.cpp
deleted file mode 100644
index b30db928..00000000
--- a/Plugins/Movement/mcplugin_movement.cpp
+++ /dev/null
@@ -1,359 +0,0 @@
-/*++
-
-Copyright (C) 2020 Autodesk Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-	* Redistributions of source code must retain the above copyright
-	  notice, this list of conditions and the following disclaimer.
-	* Redistributions in binary form must reproduce the above copyright
-	  notice, this list of conditions and the following disclaimer in the
-	  documentation and/or other materials provided with the distribution.
-	* Neither the name of the Autodesk Inc. nor the
-	  names of its contributors may be used to endorse or promote products
-	  derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#include "libmcplugin_statefactory.hpp"
-#include "libmcplugin_interfaceexception.hpp"
-#include "libmcplugin_state.hpp"
-
-#include "libmcdriver_marlin_dynamic.hpp"
-#include "libmcenv_drivercast.hpp"
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
-
-using namespace LibMCPlugin::Impl;
-
-
-
-/*************************************************************************************************************************
- Import functionality for Driver into current plugin
-**************************************************************************************************************************/
-typedef LibMCDriver_Marlin::PDriver_Marlin PDriver_Marlin;
-typedef LibMCEnv::CDriverCast <LibMCDriver_Marlin::CDriver_Marlin, LibMCDriver_Marlin::CWrapper> PDriverCast_Marlin;
-
-
-/*************************************************************************************************************************
- Class definition of CMovementData
-**************************************************************************************************************************/
-class CMovementData : public virtual CPluginData {	
-private:
-	// We need to globally store driver wrappers in the plugin
-	PDriverCast_Marlin m_DriverCast_Marlin;
-
-public:
-
-	PDriver_Marlin acquireDriver(LibMCEnv::PStateEnvironment pStateEnvironment)
-	{
-		return m_DriverCast_Marlin.acquireDriver(pStateEnvironment, "marlin");
-	}
-
-
-	void updateStateFromDriver(PDriver_Marlin pDriver, LibMCEnv::PStateEnvironment pStateEnvironment)
-	{
-
-		if (pDriver.get() == nullptr)
-			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
-		if (pStateEnvironment.get() == nullptr)
-			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
-
-		double dTargetX;
-		double dTargetY;
-		double dTargetZ;
-		double dCurrentX;
-		double dCurrentY;
-		double dCurrentZ;
-		double dCurrentTemperature;
-		double dTargetTemperature;
-
-		pDriver->UpdateState();
-		pDriver->GetCurrentPosition(dCurrentX, dCurrentY, dCurrentZ);
-		pDriver->GetTargetPosition(dTargetX, dTargetY, dTargetZ);
-		pDriver->GetExtruderTemperature(0, dCurrentTemperature, dTargetTemperature);
-
-		pStateEnvironment->SetDoubleParameter("movementstate", "targetx", dTargetX);
-		pStateEnvironment->SetDoubleParameter("movementstate", "targety", dTargetY);
-		pStateEnvironment->SetDoubleParameter("movementstate", "targetz", dTargetZ);
-		pStateEnvironment->SetDoubleParameter("movementstate", "currentx", dCurrentX);
-		pStateEnvironment->SetDoubleParameter("movementstate", "currenty", dCurrentY);
-		pStateEnvironment->SetDoubleParameter("movementstate", "currentz", dCurrentZ);
-		pStateEnvironment->SetDoubleParameter("movementstate", "currenttemperature", dCurrentTemperature);
-		pStateEnvironment->SetDoubleParameter("movementstate", "targettemperature", dTargetTemperature);
-	}
-
-
-};
-
-
-/*************************************************************************************************************************
- Class definition of CMovementState
-**************************************************************************************************************************/
-typedef CState<CMovementData> CMovementState;
-
-/*************************************************************************************************************************
- Class definition of CMovementState_Init
-**************************************************************************************************************************/
-class CMovementState_Init : public virtual CMovementState {
-public:
-
-	CMovementState_Init(const std::string& sStateName, PPluginData pPluginData)
-		: CMovementState(getStateName(), sStateName, pPluginData)
-	{
-
-	}
-
-	static const std::string getStateName()
-	{
-		return "init";
-	}
-
-
-	void Execute(LibMCEnv::PStateEnvironment pStateEnvironment)
-	{
-
-		if (pStateEnvironment.get() == nullptr)
-			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
-
-		auto sCOMPort = pStateEnvironment->GetStringParameter ("comdata", "port");
-		auto nBaudRate = pStateEnvironment->GetIntegerParameter("comdata", "baudrate");
-
-		auto pDriver = m_pPluginData->acquireDriver(pStateEnvironment);
-		pDriver->Connect(sCOMPort, (uint32_t) nBaudRate);
-
-		pStateEnvironment->SetNextState("idle");
-	}
-
-};
-
-
-/*************************************************************************************************************************
- Class definition of CMovementState_Idle
-**************************************************************************************************************************/
-class CMovementState_Idle : public virtual CMovementState {
-public:
-
-	CMovementState_Idle(const std::string& sStateName, PPluginData pPluginData)
-		: CMovementState(getStateName(), sStateName, pPluginData)
-	{
-
-	}
-
-	static const std::string getStateName()
-	{
-		return "idle";
-	}
-
-
-	void Execute(LibMCEnv::PStateEnvironment pStateEnvironment)
-	{
-		if (pStateEnvironment.get() == nullptr)
-			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
-
-		auto pDriver = m_pPluginData->acquireDriver(pStateEnvironment);
-		
-		m_pPluginData->updateStateFromDriver(pDriver, pStateEnvironment);
-		if (pDriver->CanExecuteMovement()) {
-
-			std::string sParameterData;
-
-			LibMCEnv::PSignalHandler pSignalHandler;
-			if (pStateEnvironment->WaitForSignal("signal_recoatlayer", 100, pSignalHandler)) {
-				pStateEnvironment->StoreSignal("signal_recoat", pSignalHandler.get());
-
-				pStateEnvironment->SetNextState("moveleft");
-
-			}
-			else {
-				pStateEnvironment->SetNextState("idle");
-			}
-		}
-		else {
-			pStateEnvironment->SetNextState("idle");
-		}
-	}
-
-};
-
-
-
-/*************************************************************************************************************************
- Class definition of CMovementState_FatalError
-**************************************************************************************************************************/
-class CMovementState_FatalError : public virtual CMovementState {
-public:
-
-	CMovementState_FatalError(const std::string& sStateName, PPluginData pPluginData)
-		: CMovementState(getStateName(), sStateName, pPluginData)
-	{
-
-	}
-
-	static const std::string getStateName()
-	{
-		return "fatalerror";
-	}
-
-
-	void Execute(LibMCEnv::PStateEnvironment pStateEnvironment)
-	{
-
-		if (pStateEnvironment.get() == nullptr)
-			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
-
-		pStateEnvironment->SetNextState("fatalerror");
-	}
-
-};
-
-
-/*************************************************************************************************************************
- Class definition of CMovementState_MoveLeft
-**************************************************************************************************************************/
-class CMovementState_MoveLeft : public virtual CMovementState {
-public:
-
-	CMovementState_MoveLeft(const std::string& sStateName, PPluginData pPluginData)
-		: CMovementState(getStateName(), sStateName, pPluginData)
-	{
-
-	}
-
-	static const std::string getStateName()
-	{
-		return "moveleft";
-	}
-
-
-	void Execute(LibMCEnv::PStateEnvironment pStateEnvironment)
-	{
-
-		if (pStateEnvironment.get() == nullptr)
-			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
-
-		uint32_t nCounter = 0;
-
-		auto pDriver = m_pPluginData->acquireDriver(pStateEnvironment);
-
-		while ((nCounter < 20) || (pDriver->IsMoving())) {
-
-			if (pDriver->CanExecuteMovement() && (nCounter < 20)) {
-
-				nCounter++;
-
-				pDriver->MoveTo (nCounter * 5.0, 0.0, 0.0, 100.0);
-			}
-
-			m_pPluginData->updateStateFromDriver(pDriver, pStateEnvironment);
-
-
-			
-			pStateEnvironment->Sleep(10);
-
-
-		} 
-
-		pStateEnvironment->SetNextState("moveright");
-
-	}
-
-};
-
-
-/*************************************************************************************************************************
- Class definition of CMovementState_MoveRight
-**************************************************************************************************************************/
-class CMovementState_MoveRight : public virtual CMovementState {
-public:
-
-	CMovementState_MoveRight(const std::string& sStateName, PPluginData pPluginData)
-		: CMovementState(getStateName(), sStateName, pPluginData)
-	{
-
-	}
-
-	static const std::string getStateName()
-	{
-		return "moveright";
-	}
-
-
-	void Execute(LibMCEnv::PStateEnvironment pStateEnvironment)
-	{
-
-		if (pStateEnvironment.get() == nullptr)
-			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
-
-		pStateEnvironment->Sleep(1500);
-
-		auto pDriver = m_pPluginData->acquireDriver(pStateEnvironment);
-		pDriver->MoveTo(0.0, 0.0, 0.0, 100.0);
-		
-		while (pDriver->IsMoving()) {
-			pDriver->UpdateState ();
-			pStateEnvironment->Sleep(10);
-		} 
-
-		auto pSignal = pStateEnvironment->RetrieveSignal("signal_recoat");
-		pSignal->SetBoolResult("success", true);
-		pSignal->SignalHandled();
-
-		pStateEnvironment->SetNextState("idle");
-
-	}
-
-};
-
-
-
-/*************************************************************************************************************************
- Class definition of CStateFactory
-**************************************************************************************************************************/
-
-CStateFactory::CStateFactory(const std::string& sInstanceName)
-{
-	m_pPluginData = std::make_shared<CMovementData>();
-}
-
-
-IState* CStateFactory::CreateState(const std::string& sStateName)
-{
-
-	IState* pStateInstance = nullptr;
-
-	if (createStateInstanceByName<CMovementState_Init>(sStateName, pStateInstance, m_pPluginData))
-		return pStateInstance;
-
-	if (createStateInstanceByName<CMovementState_Idle>(sStateName, pStateInstance, m_pPluginData))
-		return pStateInstance;
-
-	if (createStateInstanceByName<CMovementState_FatalError>(sStateName, pStateInstance, m_pPluginData))
-		return pStateInstance;
-
-	if (createStateInstanceByName<CMovementState_MoveLeft>(sStateName, pStateInstance, m_pPluginData))
-		return pStateInstance;
-
-	if (createStateInstanceByName<CMovementState_MoveRight>(sStateName, pStateInstance, m_pPluginData))
-		return pStateInstance;
-
-	throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDSTATENAME);
-
-}
-
diff --git a/Plugins/Movement/CMakeLists.txt b/Plugins/PIDControl/CMakeLists.txt
similarity index 99%
rename from Plugins/Movement/CMakeLists.txt
rename to Plugins/PIDControl/CMakeLists.txt
index 540901f1..27f2876b 100644
--- a/Plugins/Movement/CMakeLists.txt
+++ b/Plugins/PIDControl/CMakeLists.txt
@@ -34,7 +34,7 @@ cmake_minimum_required(VERSION 3.5)
 ### Change the next line for making new plugins
 ##########################################################################################
 
-set (PLUGINPROJECT Movement)
+set (PLUGINPROJECT PIDControl)
 
 ##########################################################################################
 ### generic CMake code
diff --git a/Plugins/PIDControl/mcplugin_pidcontrol.cpp b/Plugins/PIDControl/mcplugin_pidcontrol.cpp
new file mode 100644
index 00000000..277a1441
--- /dev/null
+++ b/Plugins/PIDControl/mcplugin_pidcontrol.cpp
@@ -0,0 +1,293 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "libmcplugin_statefactory.hpp"
+#include "libmcplugin_interfaceexception.hpp"
+#include "libmcplugin_state.hpp"
+
+#include "libmcdriver_marlin_dynamic.hpp"
+#include "libmcenv_drivercast.hpp"
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+using namespace LibMCPlugin::Impl;
+
+
+/*************************************************************************************************************************
+ Class definition of CPIDControlData
+**************************************************************************************************************************/
+class CPIDControlData : public virtual CPluginData {
+
+public:
+
+	bool setPIDValues (LibMCEnv::PStateEnvironment pStateEnvironment, double dP, double dI, double dD)
+	{
+		auto pSignal = pStateEnvironment->PrepareSignal("movement", "signal_setpidvalues");
+		pSignal->SetDouble("dp", dP);
+		pSignal->SetDouble("di", dI);
+		pSignal->SetDouble("dd", dD);
+		pSignal->Trigger();
+
+		pStateEnvironment->LogMessage("PID-Control: setting P-Values");
+		if (pSignal->WaitForHandling(20000)) {
+			// Store the p-Values in the state
+			pStateEnvironment->SetDoubleParameter("status", "dp", dP);
+			pStateEnvironment->SetDoubleParameter("status", "di", dI);
+			pStateEnvironment->SetDoubleParameter("status", "dd", dD);
+
+			return true;
+
+		}
+		else {
+			pStateEnvironment->LogMessage("PID-Control: Set P-Values timeout");
+		}
+
+		return false;
+
+	}
+
+};
+
+/*************************************************************************************************************************
+ Class definition of CPIDControlState
+**************************************************************************************************************************/
+typedef CState<CPIDControlData> CPIDControlState;
+
+/*************************************************************************************************************************
+ Class definition of CPIDControlState_Init
+**************************************************************************************************************************/
+class CPIDControlState_Init : public virtual CPIDControlState {
+public:
+
+	CPIDControlState_Init(const std::string& sStateName, PPluginData pPluginData)
+		: CPIDControlState(getStateName(), sStateName, pPluginData)
+	{
+
+	}
+
+	static const std::string getStateName()
+	{
+		return "init";
+	}
+
+
+	void Execute(LibMCEnv::PStateEnvironment pStateEnvironment)
+	{
+
+		if (pStateEnvironment.get() == nullptr)
+			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
+
+		pStateEnvironment->LogMessage("PIDControl Initialisation...");
+
+		pStateEnvironment->SetNextState("idle");
+
+
+	}
+
+};
+
+
+/*************************************************************************************************************************
+ Class definition of CPIDControlState_Idle
+**************************************************************************************************************************/
+class CPIDControlState_Idle : public virtual CPIDControlState {
+public:
+
+	CPIDControlState_Idle(const std::string& sStateName, PPluginData pPluginData)
+		: CPIDControlState(getStateName(), sStateName, pPluginData)
+	{
+
+	}
+
+	static const std::string getStateName()
+	{
+		return "idle";
+	}
+
+
+	void Execute(LibMCEnv::PStateEnvironment pStateEnvironment)
+	{
+
+		if (pStateEnvironment.get() == nullptr)
+			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
+
+		pStateEnvironment->SetBoolParameter("status", "isactive", false);
+
+		LibMCEnv::PSignalHandler pSignalHandler;
+		if (pStateEnvironment->WaitForSignal("signal_startcontrolling", 100, pSignalHandler)) {
+
+			//pSignalHandler->SignalHandled();
+
+			pStateEnvironment->LogMessage("PIDControl Active...");
+			// TODO blocked while testing extrusion => do uncomment later pStateEnvironment->SetNextState("controlling");
+			pStateEnvironment->Sleep(2000);
+			pStateEnvironment->SetNextState("idle");
+
+		}
+		else {
+			pStateEnvironment->SetNextState("idle");
+		}
+
+
+	}
+
+};
+
+
+/*************************************************************************************************************************
+ Class definition of CPIDControlState_Controlling
+**************************************************************************************************************************/
+class CPIDControlState_Controlling : public virtual CPIDControlState {
+public:
+
+	CPIDControlState_Controlling(const std::string& sStateName, PPluginData pPluginData)
+		: CPIDControlState(getStateName(), sStateName, pPluginData)
+	{
+
+	}
+
+	static const std::string getStateName()
+	{
+		return "controlling";
+	}
+
+
+	void Execute(LibMCEnv::PStateEnvironment pStateEnvironment)
+	{
+
+		if (pStateEnvironment.get() == nullptr)
+			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
+
+		// Check if I should stop
+		LibMCEnv::PSignalHandler pSignalHandler;
+		if (pStateEnvironment->WaitForSignal("signal_stopcontrolling", 100, pSignalHandler)) {
+
+			pSignalHandler->SignalHandled();
+
+			pStateEnvironment->LogMessage("PIDControl Active...");
+			pStateEnvironment->SetNextState("idle");
+			return;
+		} 
+
+
+		// Not stopping
+
+		pStateEnvironment->SetBoolParameter("status", "isactive", true);
+		double dP = pStateEnvironment->GetDoubleParameter("status", "dp");
+		double dI = pStateEnvironment->GetDoubleParameter("status", "di");
+		double dD = pStateEnvironment->GetDoubleParameter("status", "dd");
+
+		// Adjust the parameters somehow
+		dP += 0.1;
+		dI -= 0.05;
+		dD = (dP + dI) * 0.5;
+
+		if (m_pPluginData->setPIDValues(pStateEnvironment, dP, dI, dD)) {
+			pStateEnvironment->SetNextState("controlling");
+
+		}
+		else {
+			// Could not change signal...
+			pStateEnvironment->LogMessage("Could not set P-Values!");
+			pStateEnvironment->SetNextState("fatalerror");
+		} 
+
+
+	}
+
+};
+
+
+
+/*************************************************************************************************************************
+ Class definition of CPIDControlState_FatalError
+**************************************************************************************************************************/
+class CPIDControlState_FatalError : public virtual CPIDControlState {
+public:
+
+	CPIDControlState_FatalError(const std::string& sStateName, PPluginData pPluginData)
+		: CPIDControlState(getStateName(), sStateName, pPluginData)
+	{
+
+	}
+
+	static const std::string getStateName()
+	{
+		return "fatalerror";
+	}
+
+
+	void Execute(LibMCEnv::PStateEnvironment pStateEnvironment)
+	{
+
+		if (pStateEnvironment.get() == nullptr)
+			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
+
+		pStateEnvironment->SetNextState("fatalerror");
+
+	}
+
+};
+
+
+/*************************************************************************************************************************
+ Class definition of CStateFactory
+**************************************************************************************************************************/
+
+CStateFactory::CStateFactory(const std::string& sInstanceName)
+{
+	m_pPluginData = std::make_shared<CPIDControlData>();
+}
+
+
+IState* CStateFactory::CreateState(const std::string& sStateName)
+{
+
+	IState* pStateInstance = nullptr;
+
+	if (createStateInstanceByName<CPIDControlState_Init>(sStateName, pStateInstance, m_pPluginData))
+		return pStateInstance;
+
+	if (createStateInstanceByName<CPIDControlState_Idle>(sStateName, pStateInstance, m_pPluginData))
+		return pStateInstance;
+
+	if (createStateInstanceByName<CPIDControlState_Controlling>(sStateName, pStateInstance, m_pPluginData))
+		return pStateInstance;
+
+	if (createStateInstanceByName<CPIDControlState_FatalError>(sStateName, pStateInstance, m_pPluginData))
+		return pStateInstance;
+
+	throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDSTATENAME);
+
+}
+
diff --git a/Plugins/PrinterConnection/CMakeLists.txt b/Plugins/PrinterConnection/CMakeLists.txt
new file mode 100644
index 00000000..7f8302d6
--- /dev/null
+++ b/Plugins/PrinterConnection/CMakeLists.txt
@@ -0,0 +1,109 @@
+#[[++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+]]
+
+cmake_minimum_required(VERSION 3.5)
+
+##########################################################################################
+### Change the next line for making new plugins
+##########################################################################################
+
+set (PLUGINPROJECT PrinterConnection)
+
+##########################################################################################
+### generic CMake code
+##########################################################################################
+
+project(LibMCPlugin_${PLUGINPROJECT})
+
+string(TOLOWER ${PLUGINPROJECT} PLUGINSUFFIX)
+set (PLUGINNAME libmcplugin_${PLUGINSUFFIX})
+
+
+set (CMAKE_CXX_STANDARD 11)
+set (EXPORTFLAG __LIBMCPLUGIN_EXPORTS)
+
+# The location of autogenerated interfaces
+set(CMAKE_CURRENT_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/HeadersDev/CppDynamic)
+set(CMAKE_CURRENT_AUTOGENERATED_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/InterfacesDev)
+set(CMAKE_CURRENT_PLUGIN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/PluginCpp)
+set(CMAKE_CURRENT_OUTPUT_DIR ${PROJECT_BINARY_DIR}/../../Output)
+set(CMAKE_CURRENT_DRIVERHEADER_CORE ${PROJECT_BINARY_DIR}/../../DevPackage/Framework/HeadersDriver/CppDynamic)
+set(CMAKE_CURRENT_DRIVERHEADER_DEV ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/HeadersDriver/CppDynamic)
+
+file(STRINGS ${PROJECT_BINARY_DIR}/../../githash.txt GLOBALGITHASH)
+message(STATUS "Global git hash: \"${GLOBALGITHASH}\"")
+
+file(GLOB LIBMCPLUGIN_FRAMEWORK
+	${CMAKE_CURRENT_PLUGIN_DIR}/*.cpp
+	${CMAKE_CURRENT_AUTOGENERATED_DIR}/libmcplugin_interfaceexception.cpp
+	${CMAKE_CURRENT_AUTOGENERATED_DIR}/libmcplugin_interfacewrapper.cpp
+)
+
+file(GLOB LIBMCPLUGIN_SRC
+	${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
+)
+
+source_group("framework" FILES ${LIBMCPLUGIN_FRAMEWORK} )
+source_group("source" FILES ${LIBMCPLUGIN_SRC} )
+add_library(${PLUGINNAME} SHARED ${LIBMCPLUGIN_SRC} ${LIBMCPLUGIN_FRAMEWORK})
+# Do not prefix the binary's name with "lib" on Unix systems:
+set_target_properties(${PLUGINNAME} PROPERTIES PREFIX "" IMPORT_PREFIX "" )
+# The following two properties are crucial to reduce the number of undesirably exported symbols
+set_target_properties(${PLUGINNAME} PROPERTIES CXX_VISIBILITY_PRESET hidden)
+set_target_properties(${PLUGINNAME} PROPERTIES VISIBILITY_INLINES_HIDDEN ON)
+
+# This makes sure symbols are exported
+target_compile_options(${PLUGINNAME} PRIVATE "-D${EXPORTFLAG}")
+target_include_directories(${PLUGINNAME} PRIVATE ${CMAKE_CURRENT_AUTOGENERATED_DIR})
+target_include_directories(${PLUGINNAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(${PLUGINNAME} PRIVATE ${CMAKE_CURRENT_PLUGIN_DIR})
+target_include_directories(${PLUGINNAME} PRIVATE ${CMAKE_CURRENT_HEADER_DIR})
+target_include_directories(${PLUGINNAME} PRIVATE ${CMAKE_CURRENT_DRIVERHEADER_CORE})
+target_include_directories(${PLUGINNAME} PRIVATE ${CMAKE_CURRENT_DRIVERHEADER_DEV})
+
+set_target_properties(${PLUGINNAME}
+    PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_OUTPUT_DIR}"
+    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_OUTPUT_DIR}"
+    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_OUTPUT_DIR}"
+	LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_OUTPUT_DIR}"
+	ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_OUTPUT_DIR}" 		
+	VS_DEBUGGER_COMMAND "${CMAKE_CURRENT_OUTPUT_DIR}/amc_server.exe"
+	VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_OUTPUT_DIR}"	
+	OUTPUT_NAME "${GLOBALGITHASH}_plugin_${PLUGINSUFFIX}"	
+)
+
+
+##########################################################################################
+### Add dependencies for drivers below
+###########################################################################################
+if (TARGET libmcdriver_marlin) 
+	add_dependencies (${PLUGINNAME} libmcdriver_marlin)
+endif()
diff --git a/Plugins/PrinterConnection/mcplugin_printerconnection.cpp b/Plugins/PrinterConnection/mcplugin_printerconnection.cpp
new file mode 100644
index 00000000..2bd46610
--- /dev/null
+++ b/Plugins/PrinterConnection/mcplugin_printerconnection.cpp
@@ -0,0 +1,611 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Autodesk Inc. nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include <chrono>
+#include <sstream>
+
+
+#include "libmcplugin_statefactory.hpp"
+#include "libmcplugin_interfaceexception.hpp"
+#include "libmcplugin_state.hpp"
+
+#include "libmcdriver_marlin_dynamic.hpp"
+#include "libmcenv_drivercast.hpp"
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4250)
+#endif
+
+using namespace LibMCPlugin::Impl;
+
+
+
+/*************************************************************************************************************************
+ Import functionality for Driver into current plugin
+**************************************************************************************************************************/
+typedef LibMCDriver_Marlin::PDriver_Marlin PDriver_Marlin;
+typedef LibMCEnv::CDriverCast <LibMCDriver_Marlin::CDriver_Marlin, LibMCDriver_Marlin::CWrapper> PDriverCast_Marlin;
+
+
+/*************************************************************************************************************************
+ Class definition of CMovementData
+**************************************************************************************************************************/
+class CPrinterConnectionData : public virtual CPluginData {	
+private:
+	// We need to globally store driver wrappers in the plugin
+	PDriverCast_Marlin m_DriverCast_Marlin;
+
+public:
+
+	PDriver_Marlin acquireDriver(LibMCEnv::PStateEnvironment pStateEnvironment)
+	{
+		return m_DriverCast_Marlin.acquireDriver(pStateEnvironment, "marlin");
+	}
+
+
+	void updatePIDValues(PDriver_Marlin pDriver, LibMCEnv::PStateEnvironment pStateEnvironment)
+	{
+		LibMCEnv::PSignalHandler pSignalHandler;
+		if (pStateEnvironment->WaitForSignal("signal_setpidvalues", 0, pSignalHandler)) {
+			double dP = pSignalHandler->GetDouble("dp");
+			double dI = pSignalHandler->GetDouble("di");
+			double dD = pSignalHandler->GetDouble("dd");
+
+			pStateEnvironment->LogMessage("Setting PID Value to P: " + std::to_string (dP) + " I: " + std::to_string(dI) + "D: " + std::to_string(dD));
+			pDriver->SetPidParameters (dP, dI, dD);
+
+			pSignalHandler->SetBoolResult("success", true);
+			pSignalHandler->SignalHandled();
+		} 
+
+	}
+
+	void updateStateFromDriver(PDriver_Marlin pDriver, LibMCEnv::PStateEnvironment pStateEnvironment, bool bDoUpdatePIDValues)
+	{
+
+		if (pDriver.get() == nullptr)
+			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
+		if (pStateEnvironment.get() == nullptr)
+			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
+
+		double dTargetX;
+		double dTargetY;
+		double dTargetZ;
+		double dCurrentX;
+		double dCurrentY;
+		double dCurrentZ;
+		double dCurrentExtruderTemperature;
+		double dTargetExtruderTemperature;
+		double dCurrentBedTemperature;
+		double dTargetBedTemperature;
+		double dP;
+		double dI;
+		double dD;
+
+		if (bDoUpdatePIDValues) {
+			updatePIDValues(pDriver, pStateEnvironment);
+		}
+		pDriver->UpdateState();
+		pDriver->GetCurrentPosition(dCurrentX, dCurrentY, dCurrentZ);
+		pDriver->GetTargetPosition(dTargetX, dTargetY, dTargetZ);
+		pDriver->GetExtruderTemperature(0, dTargetExtruderTemperature, dCurrentExtruderTemperature);
+		pDriver->GetHeatedBedTemperature(dTargetBedTemperature, dCurrentBedTemperature);
+		pDriver->GetPidParameters(dP, dI, dD);
+
+		pStateEnvironment->SetDoubleParameter("movementstate", "targetx", dTargetX);
+		pStateEnvironment->SetDoubleParameter("movementstate", "targety", dTargetY);
+		pStateEnvironment->SetDoubleParameter("movementstate", "targetz", dTargetZ);
+		pStateEnvironment->SetDoubleParameter("movementstate", "currentx", dCurrentX);
+		pStateEnvironment->SetDoubleParameter("movementstate", "currenty", dCurrentY);
+		pStateEnvironment->SetDoubleParameter("movementstate", "currentz", dCurrentZ);
+		pStateEnvironment->SetDoubleParameter("movementstate", "currenttemperatureextruder", dCurrentExtruderTemperature);
+		pStateEnvironment->SetDoubleParameter("movementstate", "targettemperatureextruder", dTargetExtruderTemperature);
+		pStateEnvironment->SetDoubleParameter("movementstate", "currenttemperaturebed", dCurrentBedTemperature);
+		pStateEnvironment->SetDoubleParameter("movementstate", "targettemperaturebed", dTargetBedTemperature);
+		pStateEnvironment->SetBoolParameter("movementstate", "ishomed", pDriver->IsHomed());
+		pStateEnvironment->SetBoolParameter("movementstate", "ismoving", pDriver->IsMoving());
+		pStateEnvironment->SetBoolParameter("movementstate", "bufferavailable", pDriver->CanExecuteMovement());
+		pStateEnvironment->SetDoubleParameter("movementstate", "pidvaluep", dP);
+		pStateEnvironment->SetDoubleParameter("movementstate", "pidvaluei", dI);
+		pStateEnvironment->SetDoubleParameter("movementstate", "pidvalued", dD);
+	}
+
+
+};
+
+
+/*************************************************************************************************************************
+ Class definition of CPrinterConnectionState
+**************************************************************************************************************************/
+typedef CState<CPrinterConnectionData> CPrinterConnectionState;
+
+/*************************************************************************************************************************
+ Class definition of CPrinterConnectionState_Init
+**************************************************************************************************************************/
+class CPrinterConnectionState_Init : public virtual CPrinterConnectionState {
+public:
+
+	CPrinterConnectionState_Init(const std::string& sStateName, PPluginData pPluginData)
+		: CPrinterConnectionState(getStateName(), sStateName, pPluginData)
+	{
+
+	}
+
+	static const std::string getStateName()
+	{
+		return "init";
+	}
+
+
+	void Execute(LibMCEnv::PStateEnvironment pStateEnvironment)
+	{
+
+		if (pStateEnvironment.get() == nullptr)
+			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
+
+		auto sCOMPort = pStateEnvironment->GetStringParameter ("comdata", "port");
+		auto nBaudRate = pStateEnvironment->GetIntegerParameter("comdata", "baudrate");
+		auto nConnectTimeout = pStateEnvironment->GetIntegerParameter("comdata", "connecttimeout");
+		auto dTimerInterval = pStateEnvironment->GetDoubleParameter("movementstate", "statusupdateinterval");
+
+		auto pDriver = m_pPluginData->acquireDriver(pStateEnvironment);
+		pDriver->Connect(sCOMPort, (uint32_t) nBaudRate, dTimerInterval, nConnectTimeout);
+		m_pPluginData->updateStateFromDriver(pDriver, pStateEnvironment, false);
+
+		if (!pDriver->IsHomed()) {
+			pStateEnvironment->SetNextState("homing");
+		}
+		else {
+			// TODO set temp, fan speed etc parameters??
+			//pDriver->SetFanSpeed(0, 126);
+			//pDriver->SetExtruderTargetTemperature(0, 190, false);
+			//pDriver->SetHeatedBedTargetTemperature(45, false);
+			// TODO lower temp for testing without extrusion
+			//pDriver->SetExtruderTargetTemperature(0, 25, false);
+			//pDriver->SetHeatedBedTargetTemperature(25, false);
+
+			//pDriver->SetExtruderTargetTemperature(0, 190, true);
+			//pDriver->SetHeatedBedTargetTemperature(45, true);
+			// TODO lower temp for testing without extrusion
+			//pDriver->SetExtruderTargetTemperature(0, 30, true);
+			//pDriver->SetHeatedBedTargetTemperature(30, true);
+
+			pStateEnvironment->SetNextState("idle");
+		}
+
+	}
+
+};
+
+
+/*************************************************************************************************************************
+ Class definition of CPrinterConnectionState_Idle
+**************************************************************************************************************************/
+class CPrinterConnectionState_Idle : public virtual CPrinterConnectionState {
+public:
+
+	CPrinterConnectionState_Idle(const std::string& sStateName, PPluginData pPluginData)
+		: CPrinterConnectionState(getStateName(), sStateName, pPluginData)
+	{
+
+	}
+
+	static const std::string getStateName()
+	{
+		return "idle";
+	}
+
+
+	void Execute(LibMCEnv::PStateEnvironment pStateEnvironment)
+	{
+		if (pStateEnvironment.get() == nullptr)
+			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
+
+		auto pDriver = m_pPluginData->acquireDriver(pStateEnvironment);
+		
+		m_pPluginData->updateStateFromDriver(pDriver, pStateEnvironment, false);
+		if (pDriver->CanExecuteMovement()) {
+
+			std::string sParameterData;
+
+			LibMCEnv::PSignalHandler pSignalHandler;
+			if (pStateEnvironment->WaitForSignal("signal_doextrudelayer", 100, pSignalHandler)) {
+
+				pStateEnvironment->StoreSignal("globalsignal_doextrudelayer", pSignalHandler.get());
+				pStateEnvironment->SetNextState("doextrudelayer");
+
+			}
+			else {
+				pStateEnvironment->SetNextState("idle");
+			}
+		}
+		else {
+			pStateEnvironment->SetNextState("idle");
+		}
+	}
+
+};
+
+
+
+/*************************************************************************************************************************
+ Class definition of CPrinterConnectionState_FatalError
+**************************************************************************************************************************/
+class CPrinterConnectionState_FatalError : public virtual CPrinterConnectionState {
+public:
+
+	CPrinterConnectionState_FatalError(const std::string& sStateName, PPluginData pPluginData)
+		: CPrinterConnectionState(getStateName(), sStateName, pPluginData)
+	{
+
+	}
+
+	static const std::string getStateName()
+	{
+		return "fatalerror";
+	}
+
+
+	void Execute(LibMCEnv::PStateEnvironment pStateEnvironment)
+	{
+
+		if (pStateEnvironment.get() == nullptr)
+			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
+		
+		pStateEnvironment->SetNextState("fatalerror");
+	}
+
+};
+
+/*************************************************************************************************************************
+ Class definition of CPrinterConnectionState_DoExtrudeLayer
+**************************************************************************************************************************/
+class CPrinterConnectionState_DoExtrudeLayer : public virtual CPrinterConnectionState {
+private:
+
+	bool timeElapsed(int64_t nLayerTimeout, std::chrono::high_resolution_clock::time_point tStart) {
+		auto tEnd = std::chrono::high_resolution_clock::now();
+		if ((std::chrono::duration_cast<std::chrono::milliseconds> (tEnd -tStart).count() > nLayerTimeout)) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+
+	bool canExecuteMovement(LibMCEnv::PStateEnvironment pStateEnvironment, double dStatusUpdateInterval, PDriver_Marlin pDriver, int64_t nLayerTimeout, std::chrono::high_resolution_clock::time_point tStart)
+	{
+		bool bSucces = true;
+		while (!pDriver->CanExecuteMovement()) {
+			if (dStatusUpdateInterval < 0.0)
+				dStatusUpdateInterval = 0.0;
+
+			pStateEnvironment->Sleep((uint32_t) dStatusUpdateInterval);
+			m_pPluginData->updateStateFromDriver(pDriver, pStateEnvironment, true);
+			if (timeElapsed(nLayerTimeout, tStart)) {
+				bSucces = false;
+				break;
+			}
+		}
+		return bSucces;
+	}
+
+public:
+	
+	CPrinterConnectionState_DoExtrudeLayer(const std::string& sStateName, PPluginData pPluginData)
+		: CPrinterConnectionState(getStateName(), sStateName, pPluginData)
+	{
+
+	}
+
+	static const std::string getStateName()
+	{
+		return "doextrudelayer";
+	}
+
+	void Execute(LibMCEnv::PStateEnvironment pStateEnvironment)
+	{
+
+		if (pStateEnvironment.get() == nullptr)
+			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
+		bool bSucces = true;
+		std::stringstream sNoSuccessMsg;
+
+		double dStatusUpdateInterval = pStateEnvironment->GetDoubleParameter("movementstate", "statusupdateinterval");
+
+		auto pSignal = pStateEnvironment->RetrieveSignal("globalsignal_doextrudelayer");
+		auto sJobUUID = pSignal->GetString("jobuuid");
+		auto nLayerIndex = pSignal->GetInteger("layerindex");
+		auto nLayerTimeout = pSignal->GetInteger("layertimeout");
+
+		auto pToolpathAccessor = pStateEnvironment->GetBuildJob(sJobUUID)->CreateToolpathAccessor();
+		auto pLayer = pToolpathAccessor->LoadLayer((uint32_t)nLayerIndex);
+		auto dUnit = pLayer->GetUnits();
+		auto dLayerZ = pLayer->GetZValue();
+		double dZ = dLayerZ * dUnit;
+
+		// TODO set speed values by reading data from toolptah... uncomment if data is available
+		//const double dSpeedMmPerSecond = pLayer->GetSegmentProfileTypedValue(LibMCEnv::eToolpathProfileValueType::Speed);
+		//const double dSpeedFastMmPerSecond = pLayer->GetSegmentProfileTypedValue(LibMCEnv::eToolpathProfileValueType::JumpSpeed);
+		//const double dExtrusionFactor = pLayer->GetSegmentProfileTypedValue(LibMCEnv::eToolpathProfileValueType::ExtrusionFactor);
+		const double dSpeedMmPerSecond = 20;
+		const double dSpeedFastMmPerSecond = 50;
+		const double dExtrusionFactor = 5.0;
+		double dE = 0.0;
+
+		auto pDriver = m_pPluginData->acquireDriver(pStateEnvironment);
+
+		// do initial move to read z value/layer height
+		auto nSegmentCount = pLayer->GetSegmentCount();
+		auto tStart = std::chrono::high_resolution_clock::now();
+		if ((nSegmentCount > 0) && (dZ > 0)) {
+			bSucces = canExecuteMovement(pStateEnvironment, dStatusUpdateInterval, pDriver, nLayerTimeout, tStart);
+			if (bSucces) {
+				pDriver->MoveFastToZ(dZ, dSpeedFastMmPerSecond);
+				m_pPluginData->updateStateFromDriver(pDriver, pStateEnvironment, true);
+			}
+			else {
+				sNoSuccessMsg << "Timeout while moving to layer height Z=" << dZ << " of layer " << nLayerIndex;
+			}
+		}
+		
+		for (uint32_t nSegmentIndex = 0; nSegmentIndex < nSegmentCount; nSegmentIndex++) {
+			LibMCEnv::eToolpathSegmentType eSegmentType;
+			uint32_t nPointCount;
+			std::vector<LibMCEnv::sPosition2D> PointData;
+
+			pLayer->GetSegmentInfo(nSegmentIndex, eSegmentType, nPointCount);
+			pLayer->GetSegmentPointData(nSegmentIndex, PointData);
+			
+			if (eSegmentType != LibMCEnv::eToolpathSegmentType::Unknown && nPointCount > 0 && nPointCount == PointData.size() && dZ > 0.0) {
+				// handle x/y coordinates, dependent on SegmentType, no z value provided
+				// => printer head remains on z level of given layer, no retract movement handled
+				switch (eSegmentType) {
+				case LibMCEnv::eToolpathSegmentType::Hatch:
+					if (!(nPointCount % 2)) {
+						// even number draw hatch lines
+						for (uint32_t i = 0; i < nPointCount; i+=2) {
+							// move fast to first hatch coord (first of a pair of coord)
+							bSucces = canExecuteMovement(pStateEnvironment, dStatusUpdateInterval, pDriver, nLayerTimeout, tStart);
+							if (bSucces) {
+								pDriver->MoveFastToXY(PointData[i].m_Coordinates[0] * dUnit, PointData[i].m_Coordinates[1] * dUnit, dSpeedFastMmPerSecond);
+								m_pPluginData->updateStateFromDriver(pDriver, pStateEnvironment, true);
+
+								// move to second hatch coord with extrusion (second of a pair of coord)
+								bSucces = canExecuteMovement(pStateEnvironment, dStatusUpdateInterval, pDriver, nLayerTimeout, tStart);
+								if (bSucces) {
+									auto dDistance = sqrt(
+										pow(PointData[i + 1].m_Coordinates[0] - PointData[i].m_Coordinates[0], 2) +
+										pow(PointData[i + 1].m_Coordinates[1] - PointData[i].m_Coordinates[1], 2)) * dUnit;
+									dE = dDistance * dExtrusionFactor;
+									pDriver->MoveToXY(PointData[i + 1].m_Coordinates[0] * dUnit, PointData[i + (int)1].m_Coordinates[1] * dUnit, dE, dSpeedMmPerSecond);
+									m_pPluginData->updateStateFromDriver(pDriver, pStateEnvironment, true);
+								}
+								else {
+									sNoSuccessMsg << "Timeout while extruding segment " << nSegmentIndex << " of type Hatch of layer " << nLayerIndex;
+								}
+							}
+							else {
+								sNoSuccessMsg << "Timeout while extruding segment " << nSegmentIndex << " of type Hatch of layer " << nLayerIndex;
+							}
+							if (!bSucces) {
+								break;
+							}
+						}
+					}
+					else {
+						// odd number => can't draw hatch lines
+						bSucces = false;
+						sNoSuccessMsg << "Segment " << nSegmentIndex << " of type Hatch  of layer " << nLayerIndex << " has not an odd number of coordinates";
+					}
+					break;
+
+				case LibMCEnv::eToolpathSegmentType::Loop:
+					// move fast to first point of loop
+					bSucces = canExecuteMovement(pStateEnvironment, dStatusUpdateInterval, pDriver, nLayerTimeout, tStart);
+					if (bSucces) {
+						pDriver->MoveFastToXY(PointData[0].m_Coordinates[0] * dUnit, PointData[0].m_Coordinates[1] * dUnit, dSpeedFastMmPerSecond);
+						m_pPluginData->updateStateFromDriver(pDriver, pStateEnvironment, true);
+
+
+						for (uint32_t i = 1; i < nPointCount; i++) {
+							// move to rest of points of loop (with extrusion)
+							bSucces = canExecuteMovement(pStateEnvironment, dStatusUpdateInterval, pDriver, nLayerTimeout, tStart);
+							if (bSucces) {
+								auto dDistance = sqrt(
+									pow(PointData[i].m_Coordinates[0] - PointData[i - 1].m_Coordinates[0], 2) +
+									pow(PointData[i].m_Coordinates[1] - PointData[i - 1].m_Coordinates[1], 2)) * dUnit;
+								dE = dDistance * dExtrusionFactor;
+								pDriver->MoveToXY(PointData[i].m_Coordinates[0] * dUnit, PointData[i].m_Coordinates[1] * dUnit, dE, dSpeedMmPerSecond);
+								m_pPluginData->updateStateFromDriver(pDriver, pStateEnvironment, true);
+							}
+							else {
+								sNoSuccessMsg << "Timeout while extruding segment " << nSegmentIndex << " of type Loop of layer " << nLayerIndex;
+							}
+							if (!bSucces) {
+								break;
+							}
+						}
+						// move from last point in list to first point to close the of loop (with extrusion)
+						bSucces = canExecuteMovement(pStateEnvironment, dStatusUpdateInterval, pDriver, nLayerTimeout, tStart);
+						if (bSucces) {
+							auto dDistance = sqrt(
+								pow(PointData[0].m_Coordinates[0] - PointData[nPointCount - 1].m_Coordinates[0], 2) +
+								pow(PointData[0].m_Coordinates[1] - PointData[nPointCount - 1].m_Coordinates[1], 2)) * dUnit;
+							dE = dDistance * dExtrusionFactor;
+							pDriver->MoveToXY(PointData[0].m_Coordinates[0] * dUnit, PointData[0].m_Coordinates[1] * dUnit, dE, dSpeedMmPerSecond);
+							m_pPluginData->updateStateFromDriver(pDriver, pStateEnvironment, true);
+						}
+						else {
+							sNoSuccessMsg << "Timeout while extruding segment " << nSegmentIndex << " of type Loop to close loop of layer " << nLayerIndex;
+						}
+					}
+					else {
+						sNoSuccessMsg << "Timeout while moving in segment " << nSegmentIndex << " of type Loop of layer " << nLayerIndex;
+					}
+					break;
+
+				case LibMCEnv::eToolpathSegmentType::Polyline:
+					// move fast to first point of Polyline
+					bSucces = canExecuteMovement(pStateEnvironment, dStatusUpdateInterval, pDriver, nLayerTimeout, tStart);
+					if (bSucces) {
+						pDriver->MoveFastToXY(PointData[0].m_Coordinates[0] * dUnit, PointData[0].m_Coordinates[1] * dUnit, dSpeedFastMmPerSecond);
+						m_pPluginData->updateStateFromDriver(pDriver, pStateEnvironment, true);
+
+
+						for (uint32_t i = 1; i < nPointCount; i++) {
+							// move to rest of points of polyline (with extrusion)
+							bSucces = canExecuteMovement(pStateEnvironment, dStatusUpdateInterval, pDriver, nLayerTimeout, tStart);
+							if (bSucces) {
+								auto dDistance = sqrt(
+									pow(PointData[i].m_Coordinates[0] - PointData[i -1].m_Coordinates[0], 2) +
+									pow(PointData[i].m_Coordinates[1] - PointData[i - 1].m_Coordinates[1], 2)) * dUnit;
+								dE = dDistance * dExtrusionFactor;
+								pDriver->MoveToXY(PointData[i].m_Coordinates[0] * dUnit, PointData[i].m_Coordinates[1] * dUnit, dE, dSpeedMmPerSecond);
+								m_pPluginData->updateStateFromDriver(pDriver, pStateEnvironment, true);
+
+							}
+							else {
+								sNoSuccessMsg << "Timeout while extruding segment " << nSegmentIndex << " of type Polyline of layer " << nLayerIndex;
+							}
+							if (!bSucces) {
+								break;
+							}
+						}
+					}
+					else {
+						sNoSuccessMsg << "Timeout while moving in segment " << nSegmentIndex << " of type Polyline of layer " << nLayerIndex;
+					}
+					break;
+				}
+
+			}
+			if (!bSucces) {
+				break;
+			}
+		}
+
+		if (!bSucces) {
+			pStateEnvironment->LogMessage("Extrude error: " + sNoSuccessMsg.str());
+		}
+		pSignal->SetBoolResult("success", bSucces);
+		pSignal->SignalHandled();
+
+		pStateEnvironment->SetNextState("idle");
+	}
+
+};
+
+
+
+/*************************************************************************************************************************
+ Class definition of CPrinterConnectionState_Homing
+**************************************************************************************************************************/
+class CPrinterConnectionState_Homing : public virtual CPrinterConnectionState {
+public:
+
+	CPrinterConnectionState_Homing(const std::string& sStateName, PPluginData pPluginData)
+		: CPrinterConnectionState(getStateName(), sStateName, pPluginData)
+	{
+
+	}
+
+	static const std::string getStateName()
+	{
+		return "homing";
+	}
+
+
+	void Execute(LibMCEnv::PStateEnvironment pStateEnvironment)
+	{
+
+		if (pStateEnvironment.get() == nullptr)
+			throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDPARAM);
+
+		auto pDriver = m_pPluginData->acquireDriver(pStateEnvironment);
+		pDriver->StartHoming();
+
+		// TODO set temp, fan speed etc parameters??
+		//pDriver->SetFanSpeed(0, 126);
+		//pDriver->SetExtruderTargetTemperature(0, 190, false);
+		//pDriver->SetHeatedBedTargetTemperature(45, false);
+		// TODO lower temp for testing without extrusion
+		//pDriver->SetExtruderTargetTemperature(0, 25, false);
+		//pDriver->SetHeatedBedTargetTemperature(25, false);
+
+		//pDriver->SetExtruderTargetTemperature(0, 190, true);
+		//pDriver->SetHeatedBedTargetTemperature(45, true);
+		// TODO lower temp for testing without extrusion
+		//pDriver->SetExtruderTargetTemperature(0, 30, true);
+		//pDriver->SetHeatedBedTargetTemperature(30, true);
+
+		pStateEnvironment->SetNextState("idle");
+
+	}
+
+};
+
+
+
+/*************************************************************************************************************************
+ Class definition of CStateFactory
+**************************************************************************************************************************/
+
+CStateFactory::CStateFactory(const std::string& sInstanceName)
+{
+	m_pPluginData = std::make_shared<CPrinterConnectionData>();
+}
+
+
+IState* CStateFactory::CreateState(const std::string& sStateName)
+{
+
+	IState* pStateInstance = nullptr;
+
+	if (createStateInstanceByName<CPrinterConnectionState_Init>(sStateName, pStateInstance, m_pPluginData))
+		return pStateInstance;
+
+	if (createStateInstanceByName<CPrinterConnectionState_Idle>(sStateName, pStateInstance, m_pPluginData))
+		return pStateInstance;
+
+	if (createStateInstanceByName<CPrinterConnectionState_FatalError>(sStateName, pStateInstance, m_pPluginData))
+		return pStateInstance;
+
+	if (createStateInstanceByName<CPrinterConnectionState_DoExtrudeLayer>(sStateName, pStateInstance, m_pPluginData))
+		return pStateInstance;
+
+	if (createStateInstanceByName<CPrinterConnectionState_Homing>(sStateName, pStateInstance, m_pPluginData))
+		return pStateInstance;
+
+	throw ELibMCPluginInterfaceException(LIBMCPLUGIN_ERROR_INVALIDSTATENAME);
+
+}
+
diff --git a/Server/LibMC/cfunc.go b/Server/LibMC/cfunc.go
new file mode 100644
index 00000000..910e837e
--- /dev/null
+++ b/Server/LibMC/cfunc.go
@@ -0,0 +1,47 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated Go wrapper file in order to allow an easy
+use of Machine Control library.
+
+Interface version: 1.0.0
+
+*/
+
+// Code generated by Automatic Component Toolkit (ACT); DO NOT EDIT.
+
+package libmc
+
+/*
+#include "libmc_types.h"
+*/
+import "C"
+
diff --git a/Server/LibMC/libmc.go b/Server/LibMC/libmc.go
index ce292050..8595185e 100644
--- a/Server/LibMC/libmc.go
+++ b/Server/LibMC/libmc.go
@@ -41,13 +41,17 @@ Interface version: 1.0.0
 package libmc
 
 /*
+#cgo linux LDFLAGS: -ldl
+#include <stdlib.h>
 #include "libmc_dynamic.cc"
 
+	// Injected Components
 LibMCDataHandle injectLibMCDataHandle (void * pLibMCDataHandle)
 {
 	return (LibMCDataHandle) pLibMCDataHandle;
 }
 
+
 LibMCHandle loadLibMCLibrary (const char * pFileName)
 {
 	LibMCResult nResult;
@@ -79,102 +83,129 @@ void unloadLibMCLibrary (LibMCHandle nLibraryHandle)
 }
 
 
-LibMCResult CCall_libmc_apiresponse_gethttpcode(LibMCHandle libraryHandle, LibMC_APIResponse pAPIResponse, LibMC_uint32 * pHTTPCode)
+LibMCResult CCall_libmc_apirequesthandler_expectsrawbody(LibMCHandle libraryHandle, LibMC_APIRequestHandler pAPIRequestHandler, bool * pValue)
 {
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_APIResponse_GetHTTPCode (pAPIResponse, pHTTPCode);	
+	return wrapperTable->m_APIRequestHandler_ExpectsRawBody (pAPIRequestHandler, pValue);
 }
 
 
-LibMCResult CCall_libmc_apiresponse_getcontenttype(LibMCHandle libraryHandle, LibMC_APIResponse pAPIResponse, const LibMC_uint32 nContentTypeBufferSize, LibMC_uint32* pContentTypeNeededChars, char * pContentTypeBuffer)
+LibMCResult CCall_libmc_apirequesthandler_expectsformdata(LibMCHandle libraryHandle, LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint32 * pFieldCount, bool * pValue)
 {
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_APIResponse_GetContentType (pAPIResponse, nContentTypeBufferSize, pContentTypeNeededChars, pContentTypeBuffer);	
+	return wrapperTable->m_APIRequestHandler_ExpectsFormData (pAPIRequestHandler, pFieldCount, pValue);
 }
 
 
-LibMCResult CCall_libmc_apiresponse_getdata(LibMCHandle libraryHandle, LibMC_APIResponse pAPIResponse, const LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer)
+LibMCResult CCall_libmc_apirequesthandler_getformdatadetails(LibMCHandle libraryHandle, LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint32 nFieldIndex, const LibMC_uint32 nNameBufferSize, LibMC_uint32* pNameNeededChars, char * pNameBuffer, bool * pIsFile, bool * pMandatory)
 {
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_APIResponse_GetData (pAPIResponse, nDataBufferSize, pDataNeededCount, pDataBuffer);	
+	return wrapperTable->m_APIRequestHandler_GetFormDataDetails (pAPIRequestHandler, nFieldIndex, nNameBufferSize, pNameNeededChars, pNameBuffer, pIsFile, pMandatory);
 }
 
 
-LibMCResult CCall_libmc_mccontext_registerlibrarypath(LibMCHandle libraryHandle, LibMC_MCContext pMCContext, const char * pLibraryName, const char * pLibraryPath)
+LibMCResult CCall_libmc_apirequesthandler_setformdatafield(LibMCHandle libraryHandle, LibMC_APIRequestHandler pAPIRequestHandler, const char * pName, LibMC_uint64 nDataFieldBufferSize, const LibMC_uint8 * pDataFieldBuffer)
 {
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_MCContext_RegisterLibraryPath (pMCContext, pLibraryName, pLibraryPath);	
+	return wrapperTable->m_APIRequestHandler_SetFormDataField (pAPIRequestHandler, pName, nDataFieldBufferSize, pDataFieldBuffer);
 }
 
 
-LibMCResult CCall_libmc_mccontext_parseconfiguration(LibMCHandle libraryHandle, LibMC_MCContext pMCContext, const char * pXMLString)
+LibMCResult CCall_libmc_apirequesthandler_setformstringfield(LibMCHandle libraryHandle, LibMC_APIRequestHandler pAPIRequestHandler, const char * pName, const char * pString)
 {
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_MCContext_ParseConfiguration (pMCContext, pXMLString);	
+	return wrapperTable->m_APIRequestHandler_SetFormStringField (pAPIRequestHandler, pName, pString);
 }
 
 
-LibMCResult CCall_libmc_mccontext_startallthreads(LibMCHandle libraryHandle, LibMC_MCContext pMCContext)
+LibMCResult CCall_libmc_apirequesthandler_handle(LibMCHandle libraryHandle, LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint64 nRawBodyBufferSize, const LibMC_uint8 * pRawBodyBuffer, const LibMC_uint32 nContentTypeBufferSize, LibMC_uint32* pContentTypeNeededChars, char * pContentTypeBuffer, LibMC_uint32 * pHTTPCode)
 {
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_MCContext_StartAllThreads (pMCContext);	
+	return wrapperTable->m_APIRequestHandler_Handle (pAPIRequestHandler, nRawBodyBufferSize, pRawBodyBuffer, nContentTypeBufferSize, pContentTypeNeededChars, pContentTypeBuffer, pHTTPCode);
 }
 
 
-LibMCResult CCall_libmc_mccontext_terminateallthreads(LibMCHandle libraryHandle, LibMC_MCContext pMCContext)
+LibMCResult CCall_libmc_apirequesthandler_getresultdata(LibMCHandle libraryHandle, LibMC_APIRequestHandler pAPIRequestHandler, const LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer)
 {
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_MCContext_TerminateAllThreads (pMCContext);	
+	return wrapperTable->m_APIRequestHandler_GetResultData (pAPIRequestHandler, nDataBufferSize, pDataNeededCount, pDataBuffer);
 }
 
 
-LibMCResult CCall_libmc_mccontext_loadclientpackage(LibMCHandle libraryHandle, LibMC_MCContext pMCContext, LibMC_uint64 nZIPStreamBufferSize, const LibMC_uint8 * pZIPStreamBuffer)
+LibMCResult CCall_libmc_mccontext_registerlibrarypath(LibMCHandle libraryHandle, LibMC_MCContext pMCContext, const char * pLibraryName, const char * pLibraryPath)
+{
+	if (libraryHandle == 0) 
+		return LIBMC_ERROR_INVALIDCAST;
+	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
+	return wrapperTable->m_MCContext_RegisterLibraryPath (pMCContext, pLibraryName, pLibraryPath);
+}
+
+
+LibMCResult CCall_libmc_mccontext_parseconfiguration(LibMCHandle libraryHandle, LibMC_MCContext pMCContext, const char * pXMLString)
+{
+	if (libraryHandle == 0) 
+		return LIBMC_ERROR_INVALIDCAST;
+	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
+	return wrapperTable->m_MCContext_ParseConfiguration (pMCContext, pXMLString);
+}
+
+
+LibMCResult CCall_libmc_mccontext_startallthreads(LibMCHandle libraryHandle, LibMC_MCContext pMCContext)
+{
+	if (libraryHandle == 0) 
+		return LIBMC_ERROR_INVALIDCAST;
+	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
+	return wrapperTable->m_MCContext_StartAllThreads (pMCContext);
+}
+
+
+LibMCResult CCall_libmc_mccontext_terminateallthreads(LibMCHandle libraryHandle, LibMC_MCContext pMCContext)
 {
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_MCContext_LoadClientPackage (pMCContext, nZIPStreamBufferSize, pZIPStreamBuffer);	
+	return wrapperTable->m_MCContext_TerminateAllThreads (pMCContext);
 }
 
 
-LibMCResult CCall_libmc_mccontext_log(LibMCHandle libraryHandle, LibMC_MCContext pMCContext, const char * pMessage, eLibMCLogSubSystem eSubsystem, eLibMCDataLogLevel eLogLevel)
+LibMCResult CCall_libmc_mccontext_loadclientpackage(LibMCHandle libraryHandle, LibMC_MCContext pMCContext, LibMC_uint64 nZIPStreamBufferSize, const LibMC_uint8 * pZIPStreamBuffer)
 {
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_MCContext_Log (pMCContext, pMessage, eSubsystem, eLogLevel);	
+	return wrapperTable->m_MCContext_LoadClientPackage (pMCContext, nZIPStreamBufferSize, pZIPStreamBuffer);
 }
 
 
-LibMCResult CCall_libmc_mccontext_handleapigetrequest(LibMCHandle libraryHandle, LibMC_MCContext pMCContext, const char * pURI, LibMC_APIResponse * pResponse)
+LibMCResult CCall_libmc_mccontext_log(LibMCHandle libraryHandle, LibMC_MCContext pMCContext, const char * pMessage, eLibMCLogSubSystem eSubsystem, eLibMCLogLevel eLogLevel)
 {
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_MCContext_HandleAPIGetRequest (pMCContext, pURI, pResponse);	
+	return wrapperTable->m_MCContext_Log (pMCContext, pMessage, eSubsystem, eLogLevel);
 }
 
 
-LibMCResult CCall_libmc_mccontext_handleapipostrequest(LibMCHandle libraryHandle, LibMC_MCContext pMCContext, const char * pURI, LibMC_uint64 nBodyBufferSize, const LibMC_uint8 * pBodyBuffer, LibMC_APIResponse * pResponse)
+LibMCResult CCall_libmc_mccontext_createapirequesthandler(LibMCHandle libraryHandle, LibMC_MCContext pMCContext, const char * pURI, const char * pRequestMethod, LibMC_APIRequestHandler * pHandlerInstance)
 {
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_MCContext_HandleAPIPostRequest (pMCContext, pURI, nBodyBufferSize, pBodyBuffer, pResponse);	
+	return wrapperTable->m_MCContext_CreateAPIRequestHandler (pMCContext, pURI, pRequestMethod, pHandlerInstance);
 }
 
 
@@ -183,7 +214,7 @@ LibMCResult CCall_libmc_getversion(LibMCHandle libraryHandle, LibMC_uint32 * pMa
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_GetVersion (pMajor, pMinor, pMicro);	
+	return wrapperTable->m_GetVersion (pMajor, pMinor, pMicro);
 }
 
 
@@ -192,7 +223,7 @@ LibMCResult CCall_libmc_getlasterror(LibMCHandle libraryHandle, LibMC_Base pInst
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_GetLastError (pInstance, nErrorMessageBufferSize, pErrorMessageNeededChars, pErrorMessageBuffer, pHasError);	
+	return wrapperTable->m_GetLastError (pInstance, nErrorMessageBufferSize, pErrorMessageNeededChars, pErrorMessageBuffer, pHasError);
 }
 
 
@@ -201,7 +232,7 @@ LibMCResult CCall_libmc_releaseinstance(LibMCHandle libraryHandle, LibMC_Base pI
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_ReleaseInstance (pInstance);	
+	return wrapperTable->m_ReleaseInstance (pInstance);
 }
 
 
@@ -210,7 +241,7 @@ LibMCResult CCall_libmc_acquireinstance(LibMCHandle libraryHandle, LibMC_Base pI
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_AcquireInstance (pInstance);	
+	return wrapperTable->m_AcquireInstance (pInstance);
 }
 
 
@@ -219,7 +250,7 @@ LibMCResult CCall_libmc_injectcomponent(LibMCHandle libraryHandle, const char *
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_InjectComponent (pNameSpace, (LibMC_pvoid) pSymbolAddressMethod);	
+	return wrapperTable->m_InjectComponent (pNameSpace, (LibMC_pvoid) pSymbolAddressMethod);
 }
 
 
@@ -228,7 +259,7 @@ LibMCResult CCall_libmc_createmccontext(LibMCHandle libraryHandle, LibMCData_Dat
 	if (libraryHandle == 0) 
 		return LIBMC_ERROR_INVALIDCAST;
 	sLibMCDynamicWrapperTable * wrapperTable = (sLibMCDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_CreateMCContext (pDataModel, pInstance);	
+	return wrapperTable->m_CreateMCContext (pDataModel, pInstance);
 }
 
 */
@@ -238,6 +269,7 @@ import (
 	"fmt"
 	"unsafe"
 	"runtime"
+	// Injected Components
 	"../LibMCData"
 )
 
@@ -423,6 +455,34 @@ const LIBMC_ERROR_TOOLPATHENTITYREFERENCEERROR = 224;
 const LIBMC_ERROR_TOOLPATHENTITYINVALIDFILE = 225;
 const LIBMC_ERROR_NO3MFLIBRARY = 226;
 const LIBMC_ERROR_INVALIDPOINTCOUNT = 227;
+const LIBMC_ERROR_DUPLICATEJOBUUID = 228;
+const LIBMC_ERROR_INVALIDJOBSTATUS = 229;
+const LIBMC_ERROR_INVALIDSTREAMCONTEXT = 230;
+const LIBMC_ERROR_JOBUUIDNOTFOUND = 231;
+const LIBMC_ERROR_INVALIDJOBNAME = 232;
+const LIBMC_ERROR_INVALIDJOBTIMESTAMP = 233;
+const LIBMC_ERROR_INVALIDUSERID = 234;
+const LIBMC_ERROR_INVALIDSTORAGECALLBACKSIGNATURE = 235;
+const LIBMC_ERROR_INVALIDSTORAGECALLBACKSTREAM = 236;
+const LIBMC_ERROR_INVALIDSTORAGEPATH = 237;
+const LIBMC_ERROR_STORAGESTREAMNOTFOUND = 238;
+const LIBMC_ERROR_DUPLICATESTORAGESTREAM = 239;
+const LIBMC_ERROR_INVALIDPARTIALUPLOAD = 240;
+const LIBMC_ERROR_PARTIALUPLOADNOTFINISHED = 241;
+const LIBMC_ERROR_APIREQUESTNOTHANDLED = 242;
+const LIBMC_ERROR_APIREQUESTALREADYHANDLED = 243;
+const LIBMC_ERROR_INVALIDAPIREQUESTTYPE = 244;
+const LIBMC_ERROR_INVALIDUPLOADSTREAM = 245;
+const LIBMC_ERROR_COULDNOTPARSEJSONREQUEST = 246;
+const LIBMC_ERROR_INVALIDCONTEXTUUID = 247;
+const LIBMC_ERROR_INVALIDUPLOADNAME = 248;
+const LIBMC_ERROR_INVALIDMIMETYPE = 249;
+const LIBMC_ERROR_INVALIDSTREAMSIZE = 250;
+const LIBMC_ERROR_INVALIDSHA256SUM = 251;
+const LIBMC_ERROR_INVALIDSTREAMUUID = 252;
+const LIBMC_ERROR_INVALIDFIELDNAME = 253;
+const LIBMC_ERROR_UPLOADSIZEMISMATCH = 254;
+const LIBMC_ERROR_CONTENTTYPENOTACCEPTED = 255;
 
 // WrappedError is an error that wraps a LibMC error.
 type WrappedError struct {
@@ -748,6 +808,62 @@ func errorMessage(errorcode uint32) string {
 		return "No 3MF Library specified";
 	case LIBMC_ERROR_INVALIDPOINTCOUNT:
 		return "Invalid point count";
+	case LIBMC_ERROR_DUPLICATEJOBUUID:
+		return "Duplicate job uuid";
+	case LIBMC_ERROR_INVALIDJOBSTATUS:
+		return "Invalid Job status";
+	case LIBMC_ERROR_INVALIDSTREAMCONTEXT:
+		return "Invalid stream context";
+	case LIBMC_ERROR_JOBUUIDNOTFOUND:
+		return "Job uuid not found";
+	case LIBMC_ERROR_INVALIDJOBNAME:
+		return "Invalid job name";
+	case LIBMC_ERROR_INVALIDJOBTIMESTAMP:
+		return "Invalid job timestamp";
+	case LIBMC_ERROR_INVALIDUSERID:
+		return "Invalid job name";
+	case LIBMC_ERROR_INVALIDSTORAGECALLBACKSIGNATURE:
+		return "Invalid storage callback signature";
+	case LIBMC_ERROR_INVALIDSTORAGECALLBACKSTREAM:
+		return "Invalid storage callback stream";
+	case LIBMC_ERROR_INVALIDSTORAGEPATH:
+		return "Invalid storage path";
+	case LIBMC_ERROR_STORAGESTREAMNOTFOUND:
+		return "Storage Stream not found";
+	case LIBMC_ERROR_DUPLICATESTORAGESTREAM:
+		return "Duplicate Storage Stream";
+	case LIBMC_ERROR_INVALIDPARTIALUPLOAD:
+		return "Invalid Partial Upload";
+	case LIBMC_ERROR_PARTIALUPLOADNOTFINISHED:
+		return "Partial Upload not finished";
+	case LIBMC_ERROR_APIREQUESTNOTHANDLED:
+		return "API Request not handled";
+	case LIBMC_ERROR_APIREQUESTALREADYHANDLED:
+		return "API Request already handled";
+	case LIBMC_ERROR_INVALIDAPIREQUESTTYPE:
+		return "Invalid API Request type";
+	case LIBMC_ERROR_INVALIDUPLOADSTREAM:
+		return "Invalid Upload Stream";
+	case LIBMC_ERROR_COULDNOTPARSEJSONREQUEST:
+		return "Could not parse JSON request";
+	case LIBMC_ERROR_INVALIDCONTEXTUUID:
+		return "Invalid Context UUID";
+	case LIBMC_ERROR_INVALIDUPLOADNAME:
+		return "Invalid Upload Name";
+	case LIBMC_ERROR_INVALIDMIMETYPE:
+		return "Invalid Mime Type";
+	case LIBMC_ERROR_INVALIDSTREAMSIZE:
+		return "Invalid Stream Size";
+	case LIBMC_ERROR_INVALIDSHA256SUM:
+		return "Invalid SHA256 Sum";
+	case LIBMC_ERROR_INVALIDSTREAMUUID:
+		return "Invalid Stream UUID";
+	case LIBMC_ERROR_INVALIDFIELDNAME:
+		return "Invalid field name";
+	case LIBMC_ERROR_UPLOADSIZEMISMATCH:
+		return "Upload size mismatch";
+	case LIBMC_ERROR_CONTENTTYPENOTACCEPTED:
+		return "Content type not accepted";
 	default:
 		return "unknown";
 	}
@@ -756,98 +872,141 @@ func errorMessage(errorcode uint32) string {
 func makeError(errorcode uint32) error {
 	return &WrappedError{errorcode, errorMessage(uint32(errorcode))}
 }
+
 // Wrapper represents the number wrapper
 type Wrapper struct {
 	_ [0]func() // uncomparable; to make == not compile
 	LibraryHandle C.LibMCHandle
 }
 
-
 // Base represents a LibMC class.
 type Base struct {
-	_     [0]func() // uncomparable; to make == not compile
-	ref   ref       // identifies a C value, see ref type
-	wrapperRef *Wrapper
-	gcPtr *ref      // used to trigger the finalizer when the Value is not referenced any more
+	_     		[0]func() // uncomparable; to make == not compile
+	Ref   		ref       // identifies a C value, see ref type
+	wrapperRef Wrapper
+	gcPtr 		*ref      // used to trigger the finalizer when the Value is not referenced any more
 }
 
 // NewBase creates a new Base.
 // The wrapped C pointer will be freed when the Go pointer is finalized,
 // but one can release it manually calling Release.
-func (wrapper * Wrapper) NewBase(r ref) Base {
+func (wrapper Wrapper) NewBase(r ref) Base {
 	gcPtr := new(ref)
 	*gcPtr = r
 	runtime.SetFinalizer(gcPtr, wrapper.releaseC)
-	return Base{ref: r, gcPtr: gcPtr, wrapperRef: wrapper}
+	return Base{Ref: r, gcPtr: gcPtr, wrapperRef: wrapper}
 }
 
 // Release releases the C pointer.
 func (inst Base) Release() error {
-	if (inst.wrapperRef != nil) {
-		err := inst.wrapperRef.ReleaseInstance(inst)
-		*inst.gcPtr = nil
-		return err
-	} else {
-		*inst.gcPtr = nil
-		return nil;
-	}
+	err := inst.wrapperRef.ReleaseInstance(inst)
+	*inst.gcPtr = nil
+	return err
 }
 
 // Equal reports whether inst and w refer to the same C pointer.
 func (inst Base) Equal(w Base) bool {
-	return inst.ref == w.ref
+	return inst.Ref == w.Ref
 }
 
-// APIResponse represents a LibMC class.
-type APIResponse struct {
+// APIRequestHandler represents a LibMC class.
+type APIRequestHandler struct {
 	Base
 }
 
-func (wrapper * Wrapper) newAPIResponse(r ref) APIResponse {
-	return APIResponse{wrapper.NewBase(r)}
+func (wrapper Wrapper) NewAPIRequestHandler(r ref) APIRequestHandler {
+	return APIRequestHandler{wrapper.NewBase(r)}
 }
-// GetHTTPCode returns the HTTP Errorcode to set (200 for success).
-func (inst APIResponse) GetHTTPCode() (uint32, error) {
-	var hTTPCode C.uint32_t
-	ret := C.CCall_libmc_apiresponse_gethttpcode(inst.wrapperRef.LibraryHandle, inst.ref, &hTTPCode)
-	if ret != 0 {
-		return 0, makeError(uint32(ret))
+
+// ExpectsRawBody checks if the raw body is needed to handle the request.
+func (inst APIRequestHandler) ExpectsRawBody() (bool, error) {
+	var value C.bool
+	returnValue := C.CCall_libmc_apirequesthandler_expectsrawbody(inst.wrapperRef.LibraryHandle, inst.Ref, &value)
+	if returnValue != 0 {
+		return false, makeError(uint32(returnValue))
+	}
+	return bool(value), nil
+}
+
+// ExpectsFormData checks if the parsed form data is needed to handle the request.
+func (inst APIRequestHandler) ExpectsFormData() (uint32, bool, error) {
+	var fieldCount C.uint32_t
+	var value C.bool
+	returnValue := C.CCall_libmc_apirequesthandler_expectsformdata(inst.wrapperRef.LibraryHandle, inst.Ref, &fieldCount, &value)
+	if returnValue != 0 {
+		return 0, false, makeError(uint32(returnValue))
+	}
+	return uint32(fieldCount), bool(value), nil
+}
+
+// GetFormDataDetails returns details of expected form data.
+func (inst APIRequestHandler) GetFormDataDetails(fieldIndex uint32) (string, bool, bool, error) {
+	var neededforname C.uint32_t
+	var filledinname C.uint32_t
+	var isFile C.bool
+	var mandatory C.bool
+	returnValue := C.CCall_libmc_apirequesthandler_getformdatadetails(inst.wrapperRef.LibraryHandle, inst.Ref, C.uint32_t(fieldIndex), 0, &neededforname, nil, &isFile, &mandatory)
+	if returnValue != 0 {
+		return "", false, false, makeError(uint32(returnValue))
+	}
+	bufferSizename := neededforname
+	buffername := make([]byte, bufferSizename)
+	returnValue = C.CCall_libmc_apirequesthandler_getformdatadetails(inst.wrapperRef.LibraryHandle, inst.Ref, C.uint32_t(fieldIndex), bufferSizename, &filledinname, (*C.char)(unsafe.Pointer(&buffername[0])), &isFile, &mandatory)
+	if returnValue != 0 {
+		return "", false, false, makeError(uint32(returnValue))
 	}
-	return uint32(hTTPCode), nil
+	return string(buffername[:(filledinname-1)]), bool(isFile), bool(mandatory), nil
 }
 
-// GetContentType returns the content type string of the data.
-func (inst APIResponse) GetContentType() (string, error) {
+// SetFormDataField passes the a form data field to the request handler. Call only, if ExpectsFormData returns true.
+func (inst APIRequestHandler) SetFormDataField(name string, dataField []uint8) error {
+	returnValue := C.CCall_libmc_apirequesthandler_setformdatafield(inst.wrapperRef.LibraryHandle, inst.Ref, C.CString(name), C.uint64_t(len(dataField)), (*C.uint8_t)(unsafe.Pointer(&dataField[0])))
+	if returnValue != 0 {
+		return makeError(uint32(returnValue))
+	}
+	return nil
+}
+
+// SetFormStringField passes the a form string field to the request handler. Call only, if ExpectsFormData returns true.
+func (inst APIRequestHandler) SetFormStringField(name string, string string) error {
+	returnValue := C.CCall_libmc_apirequesthandler_setformstringfield(inst.wrapperRef.LibraryHandle, inst.Ref, C.CString(name), C.CString(string))
+	if returnValue != 0 {
+		return makeError(uint32(returnValue))
+	}
+	return nil
+}
+
+// Handle handles the request.
+func (inst APIRequestHandler) Handle(rawBody []uint8) (string, uint32, error) {
 	var neededforcontentType C.uint32_t
 	var filledincontentType C.uint32_t
-	ret := C.CCall_libmc_apiresponse_getcontenttype(inst.wrapperRef.LibraryHandle, inst.ref, 0, &neededforcontentType, nil)
-	if ret != 0 {
-		return "", makeError(uint32(ret))
+	var hTTPCode C.uint32_t
+	returnValue := C.CCall_libmc_apirequesthandler_handle(inst.wrapperRef.LibraryHandle, inst.Ref, C.uint64_t(len(rawBody)), (*C.uint8_t)(unsafe.Pointer(&rawBody[0])), 0, &neededforcontentType, nil, &hTTPCode)
+	if returnValue != 0 {
+		return "", 0, makeError(uint32(returnValue))
 	}
 	bufferSizecontentType := neededforcontentType
 	buffercontentType := make([]byte, bufferSizecontentType)
-	ret = C.CCall_libmc_apiresponse_getcontenttype(inst.wrapperRef.LibraryHandle, inst.ref, bufferSizecontentType, &filledincontentType, (*C.char)(unsafe.Pointer(&buffercontentType[0])))
-	if ret != 0 {
-		return "", makeError(uint32(ret))
+	returnValue = C.CCall_libmc_apirequesthandler_handle(inst.wrapperRef.LibraryHandle, inst.Ref, C.uint64_t(len(rawBody)), (*C.uint8_t)(unsafe.Pointer(&rawBody[0])), bufferSizecontentType, &filledincontentType, (*C.char)(unsafe.Pointer(&buffercontentType[0])), &hTTPCode)
+	if returnValue != 0 {
+		return "", 0, makeError(uint32(returnValue))
 	}
-	return string(buffercontentType[:(filledincontentType-1)]), nil
+	return string(buffercontentType[:(filledincontentType-1)]), uint32(hTTPCode), nil
 }
 
-// GetData returns the stream content of the data.
-func (inst APIResponse) GetData() ([]uint8, error) {
-
-	var data []uint8;
+// GetResultData returns the cached stream content of the resulting data. Call only after Handle().
+func (inst APIRequestHandler) GetResultData(data []uint8) ([]uint8, error) {
 	var neededfordata C.uint64_t
-	ret := C.CCall_libmc_apiresponse_getdata(inst.wrapperRef.LibraryHandle, inst.ref, 0, &neededfordata, nil)
-	if ret != 0 {
-		return nil, makeError(uint32(ret))
+	returnValue := C.CCall_libmc_apirequesthandler_getresultdata(inst.wrapperRef.LibraryHandle, inst.Ref, 0, &neededfordata, nil)
+	if returnValue != 0 {
+		return nil, makeError(uint32(returnValue))
 	}
 	if len(data) < int(neededfordata) {
 	 data = append(data, make([]uint8, int(neededfordata)-len(data))...)
 	}
-	ret = C.CCall_libmc_apiresponse_getdata(inst.wrapperRef.LibraryHandle, inst.ref, neededfordata, nil, (*C.uint8_t)(unsafe.Pointer(&data[0])))
-	if ret != 0 {
-		return nil, makeError(uint32(ret))
+	returnValue = C.CCall_libmc_apirequesthandler_getresultdata(inst.wrapperRef.LibraryHandle, inst.Ref, neededfordata, nil, (*C.uint8_t)(unsafe.Pointer(&data[0])))
+	if returnValue != 0 {
+		return nil, makeError(uint32(returnValue))
 	}
 	return data[:int(neededfordata)], nil
 }
@@ -858,81 +1017,72 @@ type MCContext struct {
 	Base
 }
 
-func (wrapper * Wrapper) newMCContext(r ref) MCContext {
+func (wrapper Wrapper) NewMCContext(r ref) MCContext {
 	return MCContext{wrapper.NewBase(r)}
 }
+
 // RegisterLibraryPath registers a library for a given name.
 func (inst MCContext) RegisterLibraryPath(libraryName string, libraryPath string) error {
-	ret := C.CCall_libmc_mccontext_registerlibrarypath(inst.wrapperRef.LibraryHandle, inst.ref, (*C.char)(unsafe.Pointer(&[]byte(libraryName)[0])), (*C.char)(unsafe.Pointer(&[]byte(libraryPath)[0])))
-	if ret != 0 {
-		return makeError(uint32(ret))
+	returnValue := C.CCall_libmc_mccontext_registerlibrarypath(inst.wrapperRef.LibraryHandle, inst.Ref, C.CString(libraryName), C.CString(libraryPath))
+	if returnValue != 0 {
+		return makeError(uint32(returnValue))
 	}
 	return nil
 }
 
 // ParseConfiguration parses and initialises the state machines from a configuration XML.
 func (inst MCContext) ParseConfiguration(xMLString string) error {
-	ret := C.CCall_libmc_mccontext_parseconfiguration(inst.wrapperRef.LibraryHandle, inst.ref, (*C.char)(unsafe.Pointer(&[]byte(xMLString)[0])))
-	if ret != 0 {
-		return makeError(uint32(ret))
+	returnValue := C.CCall_libmc_mccontext_parseconfiguration(inst.wrapperRef.LibraryHandle, inst.Ref, C.CString(xMLString))
+	if returnValue != 0 {
+		return makeError(uint32(returnValue))
 	}
 	return nil
 }
 
 // StartAllThreads starts the threads for all the state machines.
 func (inst MCContext) StartAllThreads() error {
-	ret := C.CCall_libmc_mccontext_startallthreads(inst.wrapperRef.LibraryHandle, inst.ref)
-	if ret != 0 {
-		return makeError(uint32(ret))
+	returnValue := C.CCall_libmc_mccontext_startallthreads(inst.wrapperRef.LibraryHandle, inst.Ref)
+	if returnValue != 0 {
+		return makeError(uint32(returnValue))
 	}
 	return nil
 }
 
 // TerminateAllThreads terminates the threads for all the state machines.
 func (inst MCContext) TerminateAllThreads() error {
-	ret := C.CCall_libmc_mccontext_terminateallthreads(inst.wrapperRef.LibraryHandle, inst.ref)
-	if ret != 0 {
-		return makeError(uint32(ret))
+	returnValue := C.CCall_libmc_mccontext_terminateallthreads(inst.wrapperRef.LibraryHandle, inst.Ref)
+	if returnValue != 0 {
+		return makeError(uint32(returnValue))
 	}
 	return nil
 }
 
 // LoadClientPackage load a client package to serve the client website.
 func (inst MCContext) LoadClientPackage(zIPStream []uint8) error {
-	ret := C.CCall_libmc_mccontext_loadclientpackage(inst.wrapperRef.LibraryHandle, inst.ref, C.uint64_t(len(zIPStream)), (*C.uint8_t)(unsafe.Pointer(&zIPStream[0])))
-	if ret != 0 {
-		return makeError(uint32(ret))
+	returnValue := C.CCall_libmc_mccontext_loadclientpackage(inst.wrapperRef.LibraryHandle, inst.Ref, C.uint64_t(len(zIPStream)), (*C.uint8_t)(unsafe.Pointer(&zIPStream[0])))
+	if returnValue != 0 {
+		return makeError(uint32(returnValue))
 	}
 	return nil
 }
 
 // Log log message with a certain log level.
 func (inst MCContext) Log(message string, subsystem LogSubSystem, logLevel LogLevel) error {
-	ret := C.CCall_libmc_mccontext_log(inst.wrapperRef.LibraryHandle, inst.ref, (*C.char)(unsafe.Pointer(&[]byte(message)[0])), C.eLibMCLogSubSystem(subsystem), C.eLibMCDataLogLevel(logLevel))
-	if ret != 0 {
-		return makeError(uint32(ret))
+	returnValue := C.CCall_libmc_mccontext_log(inst.wrapperRef.LibraryHandle, inst.Ref, C.CString(message), C.eLibMCLogSubSystem(subsystem), C.eLibMCLogLevel(logLevel))
+	if returnValue != 0 {
+		return makeError(uint32(returnValue))
 	}
 	return nil
 }
 
-// HandleAPIGetRequest handle an API GET request.
-func (inst MCContext) HandleAPIGetRequest(uRI string) (APIResponse, error) {
-	var response ref
-	ret := C.CCall_libmc_mccontext_handleapigetrequest(inst.wrapperRef.LibraryHandle, inst.ref, (*C.char)(unsafe.Pointer(&[]byte(uRI)[0])), &response)
-	if ret != 0 {
-		return APIResponse{}, makeError(uint32(ret))
-	}
-	return inst.wrapperRef.newAPIResponse(response), nil
-}
-
-// HandleAPIPostRequest handle an API POST request.
-func (inst MCContext) HandleAPIPostRequest(uRI string, body []uint8) (APIResponse, error) {
-	var response ref
-	ret := C.CCall_libmc_mccontext_handleapipostrequest(inst.wrapperRef.LibraryHandle, inst.ref, (*C.char)(unsafe.Pointer(&[]byte(uRI)[0])), C.uint64_t(len(body)), (*C.uint8_t)(unsafe.Pointer(&body[0])), &response)
-	if ret != 0 {
-		return APIResponse{}, makeError(uint32(ret))
+// CreateAPIRequestHandler creates an API request handler.
+func (inst MCContext) CreateAPIRequestHandler(uRI string, requestMethod string) (APIRequestHandler, error) {
+	var handlerInstance ref
+	returnValue := C.CCall_libmc_mccontext_createapirequesthandler(inst.wrapperRef.LibraryHandle, inst.Ref, C.CString(uRI), C.CString(requestMethod), &handlerInstance)
+	if returnValue != 0 {
+		return APIRequestHandler{}, makeError(uint32(returnValue))
 	}
-	return inst.wrapperRef.newAPIResponse(response), nil
+	return inst.wrapperRef.NewAPIRequestHandler(handlerInstance), nil
 }
 
 
@@ -941,9 +1091,9 @@ func (wrapper Wrapper) GetVersion() (uint32, uint32, uint32, error) {
 	var major C.uint32_t
 	var minor C.uint32_t
 	var micro C.uint32_t
-	ret := C.CCall_libmc_getversion(wrapper.LibraryHandle, &major, &minor, &micro)
-	if ret != 0 {
-		return 0, 0, 0, makeError(uint32(ret))
+	returnValue := C.CCall_libmc_getversion(wrapper.LibraryHandle, &major, &minor, &micro)
+	if returnValue != 0 {
+		return 0, 0, 0, makeError(uint32(returnValue))
 	}
 	return uint32(major), uint32(minor), uint32(micro), nil
 }
@@ -953,42 +1103,42 @@ func (wrapper Wrapper) GetLastError(instance Base) (string, bool, error) {
 	var neededforerrorMessage C.uint32_t
 	var filledinerrorMessage C.uint32_t
 	var hasError C.bool
-	ret := C.CCall_libmc_getlasterror(wrapper.LibraryHandle, instance.ref, 0, &neededforerrorMessage, nil, &hasError)
-	if ret != 0 {
-		return "", false, makeError(uint32(ret))
+	returnValue := C.CCall_libmc_getlasterror(wrapper.LibraryHandle, instance.Ref, 0, &neededforerrorMessage, nil, &hasError)
+	if returnValue != 0 {
+		return "", false, makeError(uint32(returnValue))
 	}
 	bufferSizeerrorMessage := neededforerrorMessage
 	buffererrorMessage := make([]byte, bufferSizeerrorMessage)
-	ret = C.CCall_libmc_getlasterror(wrapper.LibraryHandle, instance.ref, bufferSizeerrorMessage, &filledinerrorMessage, (*C.char)(unsafe.Pointer(&buffererrorMessage[0])), &hasError)
-	if ret != 0 {
-		return "", false, makeError(uint32(ret))
+	returnValue = C.CCall_libmc_getlasterror(wrapper.LibraryHandle, instance.Ref, bufferSizeerrorMessage, &filledinerrorMessage, (*C.char)(unsafe.Pointer(&buffererrorMessage[0])), &hasError)
+	if returnValue != 0 {
+		return "", false, makeError(uint32(returnValue))
 	}
 	return string(buffererrorMessage[:(filledinerrorMessage-1)]), bool(hasError), nil
 }
 
 // ReleaseInstance releases shared ownership of an Instance.
 func (wrapper Wrapper) ReleaseInstance(instance Base) error {
-	ret := C.CCall_libmc_releaseinstance(wrapper.LibraryHandle, instance.ref)
-	if ret != 0 {
-		return makeError(uint32(ret))
+	returnValue := C.CCall_libmc_releaseinstance(wrapper.LibraryHandle, instance.Ref)
+	if returnValue != 0 {
+		return makeError(uint32(returnValue))
 	}
 	return nil
 }
 
 // AcquireInstance acquires shared ownership of an Instance.
 func (wrapper Wrapper) AcquireInstance(instance Base) error {
-	ret := C.CCall_libmc_acquireinstance(wrapper.LibraryHandle, instance.ref)
-	if ret != 0 {
-		return makeError(uint32(ret))
+	returnValue := C.CCall_libmc_acquireinstance(wrapper.LibraryHandle, instance.Ref)
+	if returnValue != 0 {
+		return makeError(uint32(returnValue))
 	}
 	return nil
 }
 
 // InjectComponent injects an imported component for usage within this component.
 func (wrapper Wrapper) InjectComponent(nameSpace string, symbolAddressMethod uint64) error {
-	ret := C.CCall_libmc_injectcomponent(wrapper.LibraryHandle, (*C.char)(unsafe.Pointer(&[]byte(nameSpace)[0])), C.uint64_t(symbolAddressMethod))
-	if ret != 0 {
-		return makeError(uint32(ret))
+	returnValue := C.CCall_libmc_injectcomponent(wrapper.LibraryHandle, C.CString(nameSpace), (C.uint64_t)(symbolAddressMethod))
+	if returnValue != 0 {
+		return makeError(uint32(returnValue))
 	}
 	return nil
 }
@@ -996,21 +1146,21 @@ func (wrapper Wrapper) InjectComponent(nameSpace string, symbolAddressMethod uin
 // CreateMCContext creates and initializes new MC Context.
 func (wrapper Wrapper) CreateMCContext(dataModel libmcdata.DataModel) (MCContext, error) {
 	var instance ref
-	ret := C.CCall_libmc_createmccontext(wrapper.LibraryHandle, C.injectLibMCDataHandle (unsafe.Pointer(dataModel.Ref)), &instance)
-	if ret != 0 {
-		return MCContext{}, makeError(uint32(ret))
+	returnValue := C.CCall_libmc_createmccontext(wrapper.LibraryHandle, C.injectLibMCDataHandle (unsafe.Pointer (dataModel.Ref)), &instance)
+	if returnValue != 0 {
+		return MCContext{}, makeError(uint32(returnValue))
 	}
-	return wrapper.newMCContext(instance), nil
+	return wrapper.NewMCContext(instance), nil
 }
 
-func (wrapper * Wrapper) releaseC(r *ref) error {
+func (wrapper Wrapper) releaseC(r *ref) error {
 	if r == nil || *r == nil {
 		return nil
 	}
-	return wrapper.ReleaseInstance(Base{ref: *r})
+	return wrapper.ReleaseInstance(Base{Ref: *r})
 }
 
-func (wrapper * Wrapper) CheckBinaryVersion() error {
+func (wrapper Wrapper) CheckBinaryVersion() error {
 	var nBindingMajor uint32 = 1;
 	var nBindingMinor uint32 = 0;
 	nMajor, nMinor, _, err := wrapper.GetVersion()
diff --git a/Server/LibMC/libmc_dynamic.cc b/Server/LibMC/libmc_dynamic.cc
index e329ded2..ca9148cb 100644
--- a/Server/LibMC/libmc_dynamic.cc
+++ b/Server/LibMC/libmc_dynamic.cc
@@ -42,7 +42,11 @@ Interface version: 1.0.0
 #include <windows.h>
 #else // _WIN32
 #include <dlfcn.h>
+#include <stdlib.h>
 #endif // _WIN32
+#ifdef __linux__
+#include <stddef.h>
+#endif
 
 LibMCResult InitLibMCWrapperTable(sLibMCDynamicWrapperTable * pWrapperTable)
 {
@@ -50,17 +54,20 @@ LibMCResult InitLibMCWrapperTable(sLibMCDynamicWrapperTable * pWrapperTable)
 		return LIBMC_ERROR_INVALIDPARAM;
 	
 	pWrapperTable->m_LibraryHandle = NULL;
-	pWrapperTable->m_APIResponse_GetHTTPCode = NULL;
-	pWrapperTable->m_APIResponse_GetContentType = NULL;
-	pWrapperTable->m_APIResponse_GetData = NULL;
+	pWrapperTable->m_APIRequestHandler_ExpectsRawBody = NULL;
+	pWrapperTable->m_APIRequestHandler_ExpectsFormData = NULL;
+	pWrapperTable->m_APIRequestHandler_GetFormDataDetails = NULL;
+	pWrapperTable->m_APIRequestHandler_SetFormDataField = NULL;
+	pWrapperTable->m_APIRequestHandler_SetFormStringField = NULL;
+	pWrapperTable->m_APIRequestHandler_Handle = NULL;
+	pWrapperTable->m_APIRequestHandler_GetResultData = NULL;
 	pWrapperTable->m_MCContext_RegisterLibraryPath = NULL;
 	pWrapperTable->m_MCContext_ParseConfiguration = NULL;
 	pWrapperTable->m_MCContext_StartAllThreads = NULL;
 	pWrapperTable->m_MCContext_TerminateAllThreads = NULL;
 	pWrapperTable->m_MCContext_LoadClientPackage = NULL;
 	pWrapperTable->m_MCContext_Log = NULL;
-	pWrapperTable->m_MCContext_HandleAPIGetRequest = NULL;
-	pWrapperTable->m_MCContext_HandleAPIPostRequest = NULL;
+	pWrapperTable->m_MCContext_CreateAPIRequestHandler = NULL;
 	pWrapperTable->m_GetVersion = NULL;
 	pWrapperTable->m_GetLastError = NULL;
 	pWrapperTable->m_ReleaseInstance = NULL;
@@ -120,30 +127,66 @@ LibMCResult LoadLibMCWrapperTable(sLibMCDynamicWrapperTable * pWrapperTable, con
 	#endif // _WIN32
 	
 	#ifdef _WIN32
-	pWrapperTable->m_APIResponse_GetHTTPCode = (PLibMCAPIResponse_GetHTTPCodePtr) GetProcAddress(hLibrary, "libmc_apiresponse_gethttpcode");
+	pWrapperTable->m_APIRequestHandler_ExpectsRawBody = (PLibMCAPIRequestHandler_ExpectsRawBodyPtr) GetProcAddress(hLibrary, "libmc_apirequesthandler_expectsrawbody");
 	#else // _WIN32
-	pWrapperTable->m_APIResponse_GetHTTPCode = (PLibMCAPIResponse_GetHTTPCodePtr) dlsym(hLibrary, "libmc_apiresponse_gethttpcode");
+	pWrapperTable->m_APIRequestHandler_ExpectsRawBody = (PLibMCAPIRequestHandler_ExpectsRawBodyPtr) dlsym(hLibrary, "libmc_apirequesthandler_expectsrawbody");
 	dlerror();
 	#endif // _WIN32
-	if (pWrapperTable->m_APIResponse_GetHTTPCode == NULL)
+	if (pWrapperTable->m_APIRequestHandler_ExpectsRawBody == NULL)
 		return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 	
 	#ifdef _WIN32
-	pWrapperTable->m_APIResponse_GetContentType = (PLibMCAPIResponse_GetContentTypePtr) GetProcAddress(hLibrary, "libmc_apiresponse_getcontenttype");
+	pWrapperTable->m_APIRequestHandler_ExpectsFormData = (PLibMCAPIRequestHandler_ExpectsFormDataPtr) GetProcAddress(hLibrary, "libmc_apirequesthandler_expectsformdata");
 	#else // _WIN32
-	pWrapperTable->m_APIResponse_GetContentType = (PLibMCAPIResponse_GetContentTypePtr) dlsym(hLibrary, "libmc_apiresponse_getcontenttype");
+	pWrapperTable->m_APIRequestHandler_ExpectsFormData = (PLibMCAPIRequestHandler_ExpectsFormDataPtr) dlsym(hLibrary, "libmc_apirequesthandler_expectsformdata");
 	dlerror();
 	#endif // _WIN32
-	if (pWrapperTable->m_APIResponse_GetContentType == NULL)
+	if (pWrapperTable->m_APIRequestHandler_ExpectsFormData == NULL)
 		return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 	
 	#ifdef _WIN32
-	pWrapperTable->m_APIResponse_GetData = (PLibMCAPIResponse_GetDataPtr) GetProcAddress(hLibrary, "libmc_apiresponse_getdata");
+	pWrapperTable->m_APIRequestHandler_GetFormDataDetails = (PLibMCAPIRequestHandler_GetFormDataDetailsPtr) GetProcAddress(hLibrary, "libmc_apirequesthandler_getformdatadetails");
 	#else // _WIN32
-	pWrapperTable->m_APIResponse_GetData = (PLibMCAPIResponse_GetDataPtr) dlsym(hLibrary, "libmc_apiresponse_getdata");
+	pWrapperTable->m_APIRequestHandler_GetFormDataDetails = (PLibMCAPIRequestHandler_GetFormDataDetailsPtr) dlsym(hLibrary, "libmc_apirequesthandler_getformdatadetails");
 	dlerror();
 	#endif // _WIN32
-	if (pWrapperTable->m_APIResponse_GetData == NULL)
+	if (pWrapperTable->m_APIRequestHandler_GetFormDataDetails == NULL)
+		return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_APIRequestHandler_SetFormDataField = (PLibMCAPIRequestHandler_SetFormDataFieldPtr) GetProcAddress(hLibrary, "libmc_apirequesthandler_setformdatafield");
+	#else // _WIN32
+	pWrapperTable->m_APIRequestHandler_SetFormDataField = (PLibMCAPIRequestHandler_SetFormDataFieldPtr) dlsym(hLibrary, "libmc_apirequesthandler_setformdatafield");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_APIRequestHandler_SetFormDataField == NULL)
+		return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_APIRequestHandler_SetFormStringField = (PLibMCAPIRequestHandler_SetFormStringFieldPtr) GetProcAddress(hLibrary, "libmc_apirequesthandler_setformstringfield");
+	#else // _WIN32
+	pWrapperTable->m_APIRequestHandler_SetFormStringField = (PLibMCAPIRequestHandler_SetFormStringFieldPtr) dlsym(hLibrary, "libmc_apirequesthandler_setformstringfield");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_APIRequestHandler_SetFormStringField == NULL)
+		return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_APIRequestHandler_Handle = (PLibMCAPIRequestHandler_HandlePtr) GetProcAddress(hLibrary, "libmc_apirequesthandler_handle");
+	#else // _WIN32
+	pWrapperTable->m_APIRequestHandler_Handle = (PLibMCAPIRequestHandler_HandlePtr) dlsym(hLibrary, "libmc_apirequesthandler_handle");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_APIRequestHandler_Handle == NULL)
+		return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_APIRequestHandler_GetResultData = (PLibMCAPIRequestHandler_GetResultDataPtr) GetProcAddress(hLibrary, "libmc_apirequesthandler_getresultdata");
+	#else // _WIN32
+	pWrapperTable->m_APIRequestHandler_GetResultData = (PLibMCAPIRequestHandler_GetResultDataPtr) dlsym(hLibrary, "libmc_apirequesthandler_getresultdata");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_APIRequestHandler_GetResultData == NULL)
 		return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 	
 	#ifdef _WIN32
@@ -201,21 +244,12 @@ LibMCResult LoadLibMCWrapperTable(sLibMCDynamicWrapperTable * pWrapperTable, con
 		return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 	
 	#ifdef _WIN32
-	pWrapperTable->m_MCContext_HandleAPIGetRequest = (PLibMCMCContext_HandleAPIGetRequestPtr) GetProcAddress(hLibrary, "libmc_mccontext_handleapigetrequest");
-	#else // _WIN32
-	pWrapperTable->m_MCContext_HandleAPIGetRequest = (PLibMCMCContext_HandleAPIGetRequestPtr) dlsym(hLibrary, "libmc_mccontext_handleapigetrequest");
-	dlerror();
-	#endif // _WIN32
-	if (pWrapperTable->m_MCContext_HandleAPIGetRequest == NULL)
-		return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
-	
-	#ifdef _WIN32
-	pWrapperTable->m_MCContext_HandleAPIPostRequest = (PLibMCMCContext_HandleAPIPostRequestPtr) GetProcAddress(hLibrary, "libmc_mccontext_handleapipostrequest");
+	pWrapperTable->m_MCContext_CreateAPIRequestHandler = (PLibMCMCContext_CreateAPIRequestHandlerPtr) GetProcAddress(hLibrary, "libmc_mccontext_createapirequesthandler");
 	#else // _WIN32
-	pWrapperTable->m_MCContext_HandleAPIPostRequest = (PLibMCMCContext_HandleAPIPostRequestPtr) dlsym(hLibrary, "libmc_mccontext_handleapipostrequest");
+	pWrapperTable->m_MCContext_CreateAPIRequestHandler = (PLibMCMCContext_CreateAPIRequestHandlerPtr) dlsym(hLibrary, "libmc_mccontext_createapirequesthandler");
 	dlerror();
 	#endif // _WIN32
-	if (pWrapperTable->m_MCContext_HandleAPIPostRequest == NULL)
+	if (pWrapperTable->m_MCContext_CreateAPIRequestHandler == NULL)
 		return LIBMC_ERROR_COULDNOTFINDLIBRARYEXPORT;
 	
 	#ifdef _WIN32
diff --git a/Server/LibMC/libmc_dynamic.h b/Server/LibMC/libmc_dynamic.h
index 74e25fd1..b60226d2 100644
--- a/Server/LibMC/libmc_dynamic.h
+++ b/Server/LibMC/libmc_dynamic.h
@@ -49,39 +49,87 @@ Interface version: 1.0.0
 **************************************************************************************************************************/
 
 /*************************************************************************************************************************
- Class definition for APIResponse
+ Class definition for APIRequestHandler
 **************************************************************************************************************************/
 
 /**
-* returns the HTTP Errorcode to set (200 for success).
+* checks if the raw body is needed to handle the request.
 *
-* @param[in] pAPIResponse - APIResponse instance.
-* @param[out] pHTTPCode - HTTP Code
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[out] pValue - Flag, if the raw body is needed in the request.
 * @return error code or 0 (success)
 */
-typedef LibMCResult (*PLibMCAPIResponse_GetHTTPCodePtr) (LibMC_APIResponse pAPIResponse, LibMC_uint32 * pHTTPCode);
+typedef LibMCResult (*PLibMCAPIRequestHandler_ExpectsRawBodyPtr) (LibMC_APIRequestHandler pAPIRequestHandler, bool * pValue);
 
 /**
-* returns the content type string of the data.
+* checks if the parsed form data is needed to handle the request.
 *
-* @param[in] pAPIResponse - APIResponse instance.
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[out] pFieldCount - Number of Form Data entries that are expected.
+* @param[out] pValue - Flag, if the parsed form data is needed in the request.
+* @return error code or 0 (success)
+*/
+typedef LibMCResult (*PLibMCAPIRequestHandler_ExpectsFormDataPtr) (LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint32 * pFieldCount, bool * pValue);
+
+/**
+* returns details of expected form data.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] nFieldIndex - Index of Form Data Field (0..FieldCount - 1)
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name of the expected form data field., may be NULL
+* @param[out] pIsFile - Flag, if the field Is a file field.
+* @param[out] pMandatory - Flag, if the field MUST be present.
+* @return error code or 0 (success)
+*/
+typedef LibMCResult (*PLibMCAPIRequestHandler_GetFormDataDetailsPtr) (LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint32 nFieldIndex, const LibMC_uint32 nNameBufferSize, LibMC_uint32* pNameNeededChars, char * pNameBuffer, bool * pIsFile, bool * pMandatory);
+
+/**
+* passes the a form data field to the request handler. Call only, if ExpectsFormData returns true.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] pName - Name of the form data field.
+* @param[in] nDataFieldBufferSize - Number of elements in buffer
+* @param[in] pDataFieldBuffer - uint8 buffer of DataField that was sent.
+* @return error code or 0 (success)
+*/
+typedef LibMCResult (*PLibMCAPIRequestHandler_SetFormDataFieldPtr) (LibMC_APIRequestHandler pAPIRequestHandler, const char * pName, LibMC_uint64 nDataFieldBufferSize, const LibMC_uint8 * pDataFieldBuffer);
+
+/**
+* passes the a form string field to the request handler. Call only, if ExpectsFormData returns true.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] pName - Name of the form data field.
+* @param[in] pString - DataString that was sent.
+* @return error code or 0 (success)
+*/
+typedef LibMCResult (*PLibMCAPIRequestHandler_SetFormStringFieldPtr) (LibMC_APIRequestHandler pAPIRequestHandler, const char * pName, const char * pString);
+
+/**
+* handles the request.
+*
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
+* @param[in] nRawBodyBufferSize - Number of elements in buffer
+* @param[in] pRawBodyBuffer - uint8 buffer of Raw Body that was sent. Only necessary, if ExpectsRawBody returns true.
 * @param[in] nContentTypeBufferSize - size of the buffer (including trailing 0)
 * @param[out] pContentTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
-* @param[out] pContentTypeBuffer -  buffer of Content Type., may be NULL
+* @param[out] pContentTypeBuffer -  buffer of the resulting Content Type String of the data., may be NULL
+* @param[out] pHTTPCode - the resulting HTTP Errorcode (200 for success).
 * @return error code or 0 (success)
 */
-typedef LibMCResult (*PLibMCAPIResponse_GetContentTypePtr) (LibMC_APIResponse pAPIResponse, const LibMC_uint32 nContentTypeBufferSize, LibMC_uint32* pContentTypeNeededChars, char * pContentTypeBuffer);
+typedef LibMCResult (*PLibMCAPIRequestHandler_HandlePtr) (LibMC_APIRequestHandler pAPIRequestHandler, LibMC_uint64 nRawBodyBufferSize, const LibMC_uint8 * pRawBodyBuffer, const LibMC_uint32 nContentTypeBufferSize, LibMC_uint32* pContentTypeNeededChars, char * pContentTypeBuffer, LibMC_uint32 * pHTTPCode);
 
 /**
-* returns the stream content of the data.
+* returns the cached stream content of the resulting data. Call only after Handle().
 *
-* @param[in] pAPIResponse - APIResponse instance.
+* @param[in] pAPIRequestHandler - APIRequestHandler instance.
 * @param[in] nDataBufferSize - Number of elements in buffer
 * @param[out] pDataNeededCount - will be filled with the count of the written elements, or needed buffer size.
 * @param[out] pDataBuffer - uint8 buffer of Binary stream data
 * @return error code or 0 (success)
 */
-typedef LibMCResult (*PLibMCAPIResponse_GetDataPtr) (LibMC_APIResponse pAPIResponse, const LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer);
+typedef LibMCResult (*PLibMCAPIRequestHandler_GetResultDataPtr) (LibMC_APIRequestHandler pAPIRequestHandler, const LibMC_uint64 nDataBufferSize, LibMC_uint64* pDataNeededCount, LibMC_uint8 * pDataBuffer);
 
 /*************************************************************************************************************************
  Class definition for MCContext
@@ -141,29 +189,18 @@ typedef LibMCResult (*PLibMCMCContext_LoadClientPackagePtr) (LibMC_MCContext pMC
 * @param[in] eLogLevel - log level
 * @return error code or 0 (success)
 */
-typedef LibMCResult (*PLibMCMCContext_LogPtr) (LibMC_MCContext pMCContext, const char * pMessage, eLibMCLogSubSystem eSubsystem, eLibMCDataLogLevel eLogLevel);
-
-/**
-* handle an API GET request.
-*
-* @param[in] pMCContext - MCContext instance.
-* @param[in] pURI - URI to serve
-* @param[out] pResponse - Response instance.
-* @return error code or 0 (success)
-*/
-typedef LibMCResult (*PLibMCMCContext_HandleAPIGetRequestPtr) (LibMC_MCContext pMCContext, const char * pURI, LibMC_APIResponse * pResponse);
+typedef LibMCResult (*PLibMCMCContext_LogPtr) (LibMC_MCContext pMCContext, const char * pMessage, eLibMCLogSubSystem eSubsystem, eLibMCLogLevel eLogLevel);
 
 /**
-* handle an API POST request.
+* creates an API request handler.
 *
 * @param[in] pMCContext - MCContext instance.
 * @param[in] pURI - URI to serve
-* @param[in] nBodyBufferSize - Number of elements in buffer
-* @param[in] pBodyBuffer - uint8 buffer of Body that was sent.
-* @param[out] pResponse - Response instance.
+* @param[in] pRequestMethod - Request Method
+* @param[out] pHandlerInstance - Request Handler instance.
 * @return error code or 0 (success)
 */
-typedef LibMCResult (*PLibMCMCContext_HandleAPIPostRequestPtr) (LibMC_MCContext pMCContext, const char * pURI, LibMC_uint64 nBodyBufferSize, const LibMC_uint8 * pBodyBuffer, LibMC_APIResponse * pResponse);
+typedef LibMCResult (*PLibMCMCContext_CreateAPIRequestHandlerPtr) (LibMC_MCContext pMCContext, const char * pURI, const char * pRequestMethod, LibMC_APIRequestHandler * pHandlerInstance);
 
 /*************************************************************************************************************************
  Global functions
@@ -231,17 +268,20 @@ typedef LibMCResult (*PLibMCCreateMCContextPtr) (LibMCData_DataModel pDataModel,
 
 typedef struct {
 	void * m_LibraryHandle;
-	PLibMCAPIResponse_GetHTTPCodePtr m_APIResponse_GetHTTPCode;
-	PLibMCAPIResponse_GetContentTypePtr m_APIResponse_GetContentType;
-	PLibMCAPIResponse_GetDataPtr m_APIResponse_GetData;
+	PLibMCAPIRequestHandler_ExpectsRawBodyPtr m_APIRequestHandler_ExpectsRawBody;
+	PLibMCAPIRequestHandler_ExpectsFormDataPtr m_APIRequestHandler_ExpectsFormData;
+	PLibMCAPIRequestHandler_GetFormDataDetailsPtr m_APIRequestHandler_GetFormDataDetails;
+	PLibMCAPIRequestHandler_SetFormDataFieldPtr m_APIRequestHandler_SetFormDataField;
+	PLibMCAPIRequestHandler_SetFormStringFieldPtr m_APIRequestHandler_SetFormStringField;
+	PLibMCAPIRequestHandler_HandlePtr m_APIRequestHandler_Handle;
+	PLibMCAPIRequestHandler_GetResultDataPtr m_APIRequestHandler_GetResultData;
 	PLibMCMCContext_RegisterLibraryPathPtr m_MCContext_RegisterLibraryPath;
 	PLibMCMCContext_ParseConfigurationPtr m_MCContext_ParseConfiguration;
 	PLibMCMCContext_StartAllThreadsPtr m_MCContext_StartAllThreads;
 	PLibMCMCContext_TerminateAllThreadsPtr m_MCContext_TerminateAllThreads;
 	PLibMCMCContext_LoadClientPackagePtr m_MCContext_LoadClientPackage;
 	PLibMCMCContext_LogPtr m_MCContext_Log;
-	PLibMCMCContext_HandleAPIGetRequestPtr m_MCContext_HandleAPIGetRequest;
-	PLibMCMCContext_HandleAPIPostRequestPtr m_MCContext_HandleAPIPostRequest;
+	PLibMCMCContext_CreateAPIRequestHandlerPtr m_MCContext_CreateAPIRequestHandler;
 	PLibMCGetVersionPtr m_GetVersion;
 	PLibMCGetLastErrorPtr m_GetLastError;
 	PLibMCReleaseInstancePtr m_ReleaseInstance;
diff --git a/Server/LibMC/libmc_types.h b/Server/LibMC/libmc_types.h
index 7927aa2b..e534b463 100644
--- a/Server/LibMC/libmc_types.h
+++ b/Server/LibMC/libmc_types.h
@@ -253,6 +253,33 @@ typedef void * LibMC_pvoid;
 #define LIBMC_ERROR_TOOLPATHENTITYINVALIDFILE 225
 #define LIBMC_ERROR_NO3MFLIBRARY 226
 #define LIBMC_ERROR_INVALIDPOINTCOUNT 227
+#define LIBMC_ERROR_DUPLICATEJOBUUID 228
+#define LIBMC_ERROR_INVALIDJOBSTATUS 229
+#define LIBMC_ERROR_INVALIDSTREAMCONTEXT 230
+#define LIBMC_ERROR_JOBUUIDNOTFOUND 231
+#define LIBMC_ERROR_INVALIDJOBNAME 232
+#define LIBMC_ERROR_INVALIDJOBTIMESTAMP 233
+#define LIBMC_ERROR_INVALIDUSERID 234
+#define LIBMC_ERROR_INVALIDSTORAGECALLBACKSIGNATURE 235
+#define LIBMC_ERROR_INVALIDSTORAGECALLBACKSTREAM 236
+#define LIBMC_ERROR_INVALIDSTORAGEPATH 237
+#define LIBMC_ERROR_STORAGESTREAMNOTFOUND 238
+#define LIBMC_ERROR_DUPLICATESTORAGESTREAM 239
+#define LIBMC_ERROR_INVALIDPARTIALUPLOAD 240
+#define LIBMC_ERROR_PARTIALUPLOADNOTFINISHED 241
+#define LIBMC_ERROR_APIREQUESTNOTHANDLED 242
+#define LIBMC_ERROR_APIREQUESTALREADYHANDLED 243
+#define LIBMC_ERROR_INVALIDAPIREQUESTTYPE 244
+#define LIBMC_ERROR_INVALIDUPLOADSTREAM 245
+#define LIBMC_ERROR_COULDNOTPARSEJSONREQUEST 246
+#define LIBMC_ERROR_INVALIDCONTEXTUUID 247
+#define LIBMC_ERROR_INVALIDUPLOADNAME 248
+#define LIBMC_ERROR_INVALIDMIMETYPE 249
+#define LIBMC_ERROR_INVALIDSTREAMSIZE 250
+#define LIBMC_ERROR_INVALIDSHA256SUM 251
+#define LIBMC_ERROR_INVALIDSTREAMUUID 252
+#define LIBMC_ERROR_INVALIDFIELDNAME 253
+#define LIBMC_ERROR_UPLOADSIZEMISMATCH 254
 
 /*************************************************************************************************************************
  Error strings for LibMC
@@ -417,6 +444,33 @@ inline const char * LIBMC_GETERRORSTRING (LibMCResult nErrorCode) {
     case LIBMC_ERROR_TOOLPATHENTITYINVALIDFILE: return "Toolpath entity is invalid";
     case LIBMC_ERROR_NO3MFLIBRARY: return "No 3MF Library specified";
     case LIBMC_ERROR_INVALIDPOINTCOUNT: return "Invalid point count";
+    case LIBMC_ERROR_DUPLICATEJOBUUID: return "Duplicate job uuid";
+    case LIBMC_ERROR_INVALIDJOBSTATUS: return "Invalid Job status";
+    case LIBMC_ERROR_INVALIDSTREAMCONTEXT: return "Invalid stream context";
+    case LIBMC_ERROR_JOBUUIDNOTFOUND: return "Job uuid not found";
+    case LIBMC_ERROR_INVALIDJOBNAME: return "Invalid job name";
+    case LIBMC_ERROR_INVALIDJOBTIMESTAMP: return "Invalid job timestamp";
+    case LIBMC_ERROR_INVALIDUSERID: return "Invalid job name";
+    case LIBMC_ERROR_INVALIDSTORAGECALLBACKSIGNATURE: return "Invalid storage callback signature";
+    case LIBMC_ERROR_INVALIDSTORAGECALLBACKSTREAM: return "Invalid storage callback stream";
+    case LIBMC_ERROR_INVALIDSTORAGEPATH: return "Invalid storage path";
+    case LIBMC_ERROR_STORAGESTREAMNOTFOUND: return "Storage Stream not found";
+    case LIBMC_ERROR_DUPLICATESTORAGESTREAM: return "Duplicate Storage Stream";
+    case LIBMC_ERROR_INVALIDPARTIALUPLOAD: return "Invalid Partial Upload";
+    case LIBMC_ERROR_PARTIALUPLOADNOTFINISHED: return "Partial Upload not finished";
+    case LIBMC_ERROR_APIREQUESTNOTHANDLED: return "API Request not handled";
+    case LIBMC_ERROR_APIREQUESTALREADYHANDLED: return "API Request already handled";
+    case LIBMC_ERROR_INVALIDAPIREQUESTTYPE: return "Invalid API Request type";
+    case LIBMC_ERROR_INVALIDUPLOADSTREAM: return "Invalid Upload Stream";
+    case LIBMC_ERROR_COULDNOTPARSEJSONREQUEST: return "Could not parse JSON request";
+    case LIBMC_ERROR_INVALIDCONTEXTUUID: return "Invalid Context UUID";
+    case LIBMC_ERROR_INVALIDUPLOADNAME: return "Invalid Upload Name";
+    case LIBMC_ERROR_INVALIDMIMETYPE: return "Invalid Mime Type";
+    case LIBMC_ERROR_INVALIDSTREAMSIZE: return "Invalid Stream Size";
+    case LIBMC_ERROR_INVALIDSHA256SUM: return "Invalid SHA256 Sum";
+    case LIBMC_ERROR_INVALIDSTREAMUUID: return "Invalid Stream UUID";
+    case LIBMC_ERROR_INVALIDFIELDNAME: return "Invalid field name";
+    case LIBMC_ERROR_UPLOADSIZEMISMATCH: return "Upload size mismatch";
     default: return "unknown error";
   }
 }
@@ -426,17 +480,42 @@ inline const char * LIBMC_GETERRORSTRING (LibMCResult nErrorCode) {
 **************************************************************************************************************************/
 
 typedef LibMCHandle LibMC_Base;
-typedef LibMCHandle LibMC_APIResponse;
+typedef LibMCHandle LibMC_APIRequestHandler;
 typedef LibMCHandle LibMC_MCContext;
 
 /*************************************************************************************************************************
  Declaration of enums
 **************************************************************************************************************************/
 
+typedef enum eLibMCLogLevel {
+  eLogLevelUserAcknowledge = 1,
+  eLogLevelFatalError = 2,
+  eLogLevelCriticalError = 3,
+  eLogLevelWarning = 4,
+  eLogLevelMessage = 5,
+  eLogLevelInfo = 6,
+  eLogLevelDebug = 7,
+  eLogLevelUnknown = 8
+} eLibMCLogLevel;
+
 typedef enum eLibMCLogSubSystem {
   eLogSubSystemSystem = 1,
   eLogSubSystemNetwork = 2
 } eLibMCLogSubSystem;
 
+/*************************************************************************************************************************
+ Declaration of enum members for 4 byte struct alignment
+**************************************************************************************************************************/
+
+typedef union {
+  eLibMCLogLevel m_enum;
+  int m_code;
+} structEnumLibMCLogLevel;
+
+typedef union {
+  eLibMCLogSubSystem m_enum;
+  int m_code;
+} structEnumLibMCLogSubSystem;
+
 
 #endif // __LIBMC_TYPES_HEADER
diff --git a/Server/LibMC/libmcdata_dynamic.h b/Server/LibMC/libmcdata_dynamic.h
new file mode 100644
index 00000000..9b2fdf94
--- /dev/null
+++ b/Server/LibMC/libmcdata_dynamic.h
@@ -0,0 +1,575 @@
+/*++
+
+Copyright (C) 2020 Autodesk Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Autodesk Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AUTODESK INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
+
+Abstract: This is an autogenerated plain C Header file in order to allow an easy
+ use of Machine Control data model library
+
+Interface version: 1.0.0
+
+*/
+
+#ifndef __LIBMCDATA_DYNAMICHEADER
+#define __LIBMCDATA_DYNAMICHEADER
+
+#include "libmcdata_types.h"
+
+
+
+/*************************************************************************************************************************
+ Class definition for Base
+**************************************************************************************************************************/
+
+/*************************************************************************************************************************
+ Class definition for Iterator
+**************************************************************************************************************************/
+
+/**
+* Iterates to the next resource in the list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pHasNext - Iterates to the next resource in the list.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataIterator_MoveNextPtr) (LibMCData_Iterator pIterator, bool * pHasNext);
+
+/**
+* Iterates to the previous resource in the list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pHasPrevious - Iterates to the previous resource in the list.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataIterator_MovePreviousPtr) (LibMCData_Iterator pIterator, bool * pHasPrevious);
+
+/**
+* Returns the resource the iterator points at.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pCurrentInstance - returns the resource instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataIterator_GetCurrentPtr) (LibMCData_Iterator pIterator, LibMCData_Base * pCurrentInstance);
+
+/**
+* Creates a new resource iterator with the same resource list.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pOutIterator - returns the cloned Iterator instance
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataIterator_ClonePtr) (LibMCData_Iterator pIterator, LibMCData_Iterator * pOutIterator);
+
+/**
+* Returns the number of resoucres the iterator captures.
+*
+* @param[in] pIterator - Iterator instance.
+* @param[out] pCount - returns the number of resources the iterator captures.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataIterator_CountPtr) (LibMCData_Iterator pIterator, LibMCData_uint64 * pCount);
+
+/*************************************************************************************************************************
+ Class definition for LogSession
+**************************************************************************************************************************/
+
+/**
+* adds a new log entry.
+*
+* @param[in] pLogSession - LogSession instance.
+* @param[in] pMessage - Log Message
+* @param[in] pSubSystem - Sub System identifier
+* @param[in] eLogLevel - Log Level
+* @param[in] pTimestamp - Timestamp in ISO8601 UTC format
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataLogSession_AddEntryPtr) (LibMCData_LogSession pLogSession, const char * pMessage, const char * pSubSystem, eLibMCDataLogLevel eLogLevel, const char * pTimestamp);
+
+/*************************************************************************************************************************
+ Class definition for StorageStream
+**************************************************************************************************************************/
+
+/**
+* returns the uuid of a storage stream.
+*
+* @param[in] pStorageStream - StorageStream instance.
+* @param[in] nUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pUUIDBuffer -  buffer of UUID String, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorageStream_GetUUIDPtr) (LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nUUIDBufferSize, LibMCData_uint32* pUUIDNeededChars, char * pUUIDBuffer);
+
+/**
+* returns the context uuid of a storage stream. Context might be for example a project uuid that this stream is part of.
+*
+* @param[in] pStorageStream - StorageStream instance.
+* @param[in] nContextUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pContextUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pContextUUIDBuffer -  buffer of UUID String, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorageStream_GetContextUUIDPtr) (LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nContextUUIDBufferSize, LibMCData_uint32* pContextUUIDNeededChars, char * pContextUUIDBuffer);
+
+/**
+* returns the timestamp of a storage stream.
+*
+* @param[in] pStorageStream - StorageStream instance.
+* @param[in] nTimestampBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTimestampNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTimestampBuffer -  buffer of Timestamp in ISO8601 UTC format, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorageStream_GetTimeStampPtr) (LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nTimestampBufferSize, LibMCData_uint32* pTimestampNeededChars, char * pTimestampBuffer);
+
+/**
+* returns the name of a storage stream.
+*
+* @param[in] pStorageStream - StorageStream instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name String, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorageStream_GetNamePtr) (LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nNameBufferSize, LibMCData_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* returns the mime type of a storage stream.
+*
+* @param[in] pStorageStream - StorageStream instance.
+* @param[in] nMimeTypeBufferSize - size of the buffer (including trailing 0)
+* @param[out] pMimeTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pMimeTypeBuffer -  buffer of Mime Type String, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorageStream_GetMIMETypePtr) (LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nMimeTypeBufferSize, LibMCData_uint32* pMimeTypeNeededChars, char * pMimeTypeBuffer);
+
+/**
+* returns the sha256 checksum of a storage stream.
+*
+* @param[in] pStorageStream - StorageStream instance.
+* @param[in] nSHA2BufferSize - size of the buffer (including trailing 0)
+* @param[out] pSHA2NeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pSHA2Buffer -  buffer of SHA1 String, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorageStream_GetSHA2Ptr) (LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nSHA2BufferSize, LibMCData_uint32* pSHA2NeededChars, char * pSHA2Buffer);
+
+/**
+* returns the size of a storage stream.
+*
+* @param[in] pStorageStream - StorageStream instance.
+* @param[out] pSize - Size
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorageStream_GetSizePtr) (LibMCData_StorageStream pStorageStream, LibMCData_uint64 * pSize);
+
+/**
+* returns the content of a storage stream.
+*
+* @param[in] pStorageStream - StorageStream instance.
+* @param[in] nContentBufferSize - Number of elements in buffer
+* @param[out] pContentNeededCount - will be filled with the count of the written elements, or needed buffer size.
+* @param[out] pContentBuffer - uint8 buffer of Byte Content of the stream
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorageStream_GetContentPtr) (LibMCData_StorageStream pStorageStream, const LibMCData_uint64 nContentBufferSize, LibMCData_uint64* pContentNeededCount, LibMCData_uint8 * pContentBuffer);
+
+/**
+* returns direct read access to the storage stream. The callbacks are only valid throughout the existence of the StorageStream instance.
+*
+* @param[in] pStorageStream - StorageStream instance.
+* @param[out] pTheReadCallback - Callback to call for reading a data chunk
+* @param[out] pTheSeekCallback - Callback to call for seeking in the stream.
+* @param[out] pStreamHandle - Handle of the stream.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorageStream_GetCallbacksPtr) (LibMCData_StorageStream pStorageStream, LibMCData_pvoid * pTheReadCallback, LibMCData_pvoid * pTheSeekCallback, LibMCData_pvoid * pStreamHandle);
+
+/*************************************************************************************************************************
+ Class definition for Storage
+**************************************************************************************************************************/
+
+/**
+* stores a new stream.
+*
+* @param[in] pStorage - Storage instance.
+* @param[in] pUUID - UUID of storage stream. Must be unique and newly generated.
+* @param[in] pContextUUID - Context UUID of storage stream. Important for ownership and deletion.
+* @param[in] pName - Name of the stream.
+* @param[in] pMimeType - Mime type of the content. MUST NOT be empty.
+* @param[in] nContentBufferSize - Number of elements in buffer
+* @param[in] pContentBuffer - uint8 buffer of Data of stream
+* @param[in] pUserID - Currently authenticated user
+* @param[out] pStreamInstance - Stream Instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorage_StoreNewStreamPtr) (LibMCData_Storage pStorage, const char * pUUID, const char * pContextUUID, const char * pName, const char * pMimeType, LibMCData_uint64 nContentBufferSize, const LibMCData_uint8 * pContentBuffer, const char * pUserID, LibMCData_StorageStream * pStreamInstance);
+
+/**
+* starts storing a stream with partial uploads.
+*
+* @param[in] pStorage - Storage instance.
+* @param[in] pUUID - UUID of storage stream. MUST be unique and newly generated.
+* @param[in] pContextUUID - Context UUID of storage stream. Important for ownership and deletion.
+* @param[in] pName - Name of the stream.
+* @param[in] pMimeType - Mime type of the content. MUST NOT be empty.
+* @param[in] nSize - Final size of the stream. MUST NOT be 0.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorage_BeginPartialStreamPtr) (LibMCData_Storage pStorage, const char * pUUID, const char * pContextUUID, const char * pName, const char * pMimeType, LibMCData_uint64 nSize);
+
+/**
+* stores data in a stream with partial uploads. Uploads should be sequential for optimal performance, but may be in arbitrary order.
+*
+* @param[in] pStorage - Storage instance.
+* @param[in] pUUID - UUID of storage stream. MUST have been created with BeginPartialStream first.
+* @param[in] nOffset - Offset in stream to store to. Can be an arbitrary position, but storage MUST NOT override already uploaded data.
+* @param[in] nContentBufferSize - Number of elements in buffer
+* @param[in] pContentBuffer - uint8 buffer of Data block to store in stream.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorage_StorePartialStreamPtr) (LibMCData_Storage pStorage, const char * pUUID, LibMCData_uint64 nOffset, LibMCData_uint64 nContentBufferSize, const LibMCData_uint8 * pContentBuffer);
+
+/**
+* Finishes storing a stream.
+*
+* @param[in] pStorage - Storage instance.
+* @param[in] pUUID - UUID of storage stream. MUST have been created with BeginPartialStream first.
+* @param[in] pSHA2 - SHA256 of the uploaded data.
+* @param[out] pStreamInstance - Stream Instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorage_FinishPartialStreamPtr) (LibMCData_Storage pStorage, const char * pUUID, const char * pSHA2, LibMCData_StorageStream * pStreamInstance);
+
+/*************************************************************************************************************************
+ Class definition for BuildJob
+**************************************************************************************************************************/
+
+/**
+* returns the uuid of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] nUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pUUIDBuffer -  buffer of UUID String, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_GetUUIDPtr) (LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nUUIDBufferSize, LibMCData_uint32* pUUIDNeededChars, char * pUUIDBuffer);
+
+/**
+* returns the name of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name String, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_GetNamePtr) (LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nNameBufferSize, LibMCData_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* returns the status of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pStatus - Status of build job.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_GetStatusPtr) (LibMCData_BuildJob pBuildJob, eLibMCDataBuildJobStatus * pStatus);
+
+/**
+* returns the timestamp when the job was created.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] nTimestampBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTimestampNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTimestampBuffer -  buffer of Timestamp in ISO8601 UTC format, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_GetTimeStampPtr) (LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nTimestampBufferSize, LibMCData_uint32* pTimestampNeededChars, char * pTimestampBuffer);
+
+/**
+* returns the storage stream of the build.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pStreamInstance - Stream Instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_GetStorageStreamPtr) (LibMCData_BuildJob pBuildJob, LibMCData_StorageStream * pStreamInstance);
+
+/**
+* creates a build job log session access class.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pLogSession - LogSession class instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_GetBuildJobLoggerPtr) (LibMCData_BuildJob pBuildJob, LibMCData_LogSession * pLogSession);
+
+/*************************************************************************************************************************
+ Class definition for BuildJobIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the build job the iterator points at.
+*
+* @param[in] pBuildJobIterator - BuildJobIterator instance.
+* @param[out] pCurrentInstance - returns the build job instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobIterator_GetCurrentJobPtr) (LibMCData_BuildJobIterator pBuildJobIterator, LibMCData_BuildJob * pCurrentInstance);
+
+/*************************************************************************************************************************
+ Class definition for BuildJobHandler
+**************************************************************************************************************************/
+
+/**
+* Creates a new build job.
+*
+* @param[in] pBuildJobHandler - BuildJobHandler instance.
+* @param[in] pJobUUID - UUID String for the build job. Must be unique and newly generated.
+* @param[in] pName - Name String
+* @param[in] pUserID - Currently authenticated user
+* @param[in] pStreamInstance - Storage stream to create the job from. ContextUUID of Stream MUST be the Job UUID.
+* @param[out] pJobInstance - Build Job Instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobHandler_CreateJobPtr) (LibMCData_BuildJobHandler pBuildJobHandler, const char * pJobUUID, const char * pName, const char * pUserID, LibMCData_StorageStream pStreamInstance, LibMCData_BuildJob * pJobInstance);
+
+/**
+* Retrieves a job with a specific UUID.
+*
+* @param[in] pBuildJobHandler - BuildJobHandler instance.
+* @param[in] pJobUUID - UUID String for the build job. Must be an existing Job.
+* @param[out] pJobInstance - Build Job Instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobHandler_RetrieveJobPtr) (LibMCData_BuildJobHandler pBuildJobHandler, const char * pJobUUID, LibMCData_BuildJob * pJobInstance);
+
+/**
+* Retrieves a list of build jobs, filtered by status.
+*
+* @param[in] pBuildJobHandler - BuildJobHandler instance.
+* @param[in] eStatus - Job Status to list.
+* @param[out] pIteratorInstance - Build Job Iterator Instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobHandler_ListJobsByStatusPtr) (LibMCData_BuildJobHandler pBuildJobHandler, eLibMCDataBuildJobStatus eStatus, LibMCData_BuildJobIterator * pIteratorInstance);
+
+/**
+* Converts a status enum to a string identifier.
+*
+* @param[in] pBuildJobHandler - BuildJobHandler instance.
+* @param[in] eStatus - Status Enum.
+* @param[in] nStringBufferSize - size of the buffer (including trailing 0)
+* @param[out] pStringNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pStringBuffer -  buffer of String Identifier., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobHandler_ConvertBuildStatusToStringPtr) (LibMCData_BuildJobHandler pBuildJobHandler, eLibMCDataBuildJobStatus eStatus, const LibMCData_uint32 nStringBufferSize, LibMCData_uint32* pStringNeededChars, char * pStringBuffer);
+
+/**
+* Converts a string identifier to a status enum. Case sensitive. Fails if invalid.
+*
+* @param[in] pBuildJobHandler - BuildJobHandler instance.
+* @param[in] pString - String Identifier.
+* @param[out] pStatus - Status Enum.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobHandler_ConvertStringToBuildStatusPtr) (LibMCData_BuildJobHandler pBuildJobHandler, const char * pString, eLibMCDataBuildJobStatus * pStatus);
+
+/*************************************************************************************************************************
+ Class definition for DataModel
+**************************************************************************************************************************/
+
+/**
+* initializes the database connection.
+*
+* @param[in] pDataModel - DataModel instance.
+* @param[in] pDataDirectory - Directory that stores the data.
+* @param[in] eDataBaseType - Type of database.
+* @param[in] pConnectionString - Connection string.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataDataModel_InitialiseDatabasePtr) (LibMCData_DataModel pDataModel, const char * pDataDirectory, eLibMCDataDataBaseType eDataBaseType, const char * pConnectionString);
+
+/**
+* returns the linear data model version.
+*
+* @param[in] pDataModel - DataModel instance.
+* @param[out] pVersion - Data model version.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataDataModel_GetDataModelVersionPtr) (LibMCData_DataModel pDataModel, LibMCData_uint32 * pVersion);
+
+/**
+* creates a storage access class.
+*
+* @param[in] pDataModel - DataModel instance.
+* @param[out] pStorage - Storage class instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataDataModel_CreateStoragePtr) (LibMCData_DataModel pDataModel, LibMCData_Storage * pStorage);
+
+/**
+* creates a build job access class.
+*
+* @param[in] pDataModel - DataModel instance.
+* @param[out] pBuildJobHandler - BuildJobHandler class instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataDataModel_CreateBuildJobHandlerPtr) (LibMCData_DataModel pDataModel, LibMCData_BuildJobHandler * pBuildJobHandler);
+
+/**
+* creates a global log session access class.
+*
+* @param[in] pDataModel - DataModel instance.
+* @param[out] pLogSession - LogSession class instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataDataModel_CreateNewLogSessionPtr) (LibMCData_DataModel pDataModel, LibMCData_LogSession * pLogSession);
+
+/*************************************************************************************************************************
+ Global functions
+**************************************************************************************************************************/
+
+/**
+* retrieves the binary version of this library.
+*
+* @param[out] pMajor - returns the major version of this library
+* @param[out] pMinor - returns the minor version of this library
+* @param[out] pMicro - returns the micro version of this library
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataGetVersionPtr) (LibMCData_uint32 * pMajor, LibMCData_uint32 * pMinor, LibMCData_uint32 * pMicro);
+
+/**
+* Returns the last error recorded on this object
+*
+* @param[in] pInstance - Instance Handle
+* @param[in] nErrorMessageBufferSize - size of the buffer (including trailing 0)
+* @param[out] pErrorMessageNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pErrorMessageBuffer -  buffer of Message of the last error, may be NULL
+* @param[out] pHasError - Is there a last error to query
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataGetLastErrorPtr) (LibMCData_Base pInstance, const LibMCData_uint32 nErrorMessageBufferSize, LibMCData_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError);
+
+/**
+* Releases shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataReleaseInstancePtr) (LibMCData_Base pInstance);
+
+/**
+* Acquires shared ownership of an Instance
+*
+* @param[in] pInstance - Instance Handle
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataAcquireInstancePtr) (LibMCData_Base pInstance);
+
+/**
+* Returns the address of the SymbolLookupMethod
+*
+* @param[out] pSymbolLookupMethod - Address of the SymbolAddressMethod
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataGetSymbolLookupMethodPtr) (LibMCData_pvoid * pSymbolLookupMethod);
+
+/**
+* Creates and initializes new MC DataModel Instance.
+*
+* @param[out] pInstance - New DataModel instance
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataCreateDataModelInstancePtr) (LibMCData_DataModel * pInstance);
+
+/*************************************************************************************************************************
+ Function Table Structure
+**************************************************************************************************************************/
+
+typedef struct {
+	void * m_LibraryHandle;
+	PLibMCDataIterator_MoveNextPtr m_Iterator_MoveNext;
+	PLibMCDataIterator_MovePreviousPtr m_Iterator_MovePrevious;
+	PLibMCDataIterator_GetCurrentPtr m_Iterator_GetCurrent;
+	PLibMCDataIterator_ClonePtr m_Iterator_Clone;
+	PLibMCDataIterator_CountPtr m_Iterator_Count;
+	PLibMCDataLogSession_AddEntryPtr m_LogSession_AddEntry;
+	PLibMCDataStorageStream_GetUUIDPtr m_StorageStream_GetUUID;
+	PLibMCDataStorageStream_GetContextUUIDPtr m_StorageStream_GetContextUUID;
+	PLibMCDataStorageStream_GetTimeStampPtr m_StorageStream_GetTimeStamp;
+	PLibMCDataStorageStream_GetNamePtr m_StorageStream_GetName;
+	PLibMCDataStorageStream_GetMIMETypePtr m_StorageStream_GetMIMEType;
+	PLibMCDataStorageStream_GetSHA2Ptr m_StorageStream_GetSHA2;
+	PLibMCDataStorageStream_GetSizePtr m_StorageStream_GetSize;
+	PLibMCDataStorageStream_GetContentPtr m_StorageStream_GetContent;
+	PLibMCDataStorageStream_GetCallbacksPtr m_StorageStream_GetCallbacks;
+	PLibMCDataStorage_StoreNewStreamPtr m_Storage_StoreNewStream;
+	PLibMCDataStorage_BeginPartialStreamPtr m_Storage_BeginPartialStream;
+	PLibMCDataStorage_StorePartialStreamPtr m_Storage_StorePartialStream;
+	PLibMCDataStorage_FinishPartialStreamPtr m_Storage_FinishPartialStream;
+	PLibMCDataBuildJob_GetUUIDPtr m_BuildJob_GetUUID;
+	PLibMCDataBuildJob_GetNamePtr m_BuildJob_GetName;
+	PLibMCDataBuildJob_GetStatusPtr m_BuildJob_GetStatus;
+	PLibMCDataBuildJob_GetTimeStampPtr m_BuildJob_GetTimeStamp;
+	PLibMCDataBuildJob_GetStorageStreamPtr m_BuildJob_GetStorageStream;
+	PLibMCDataBuildJob_GetBuildJobLoggerPtr m_BuildJob_GetBuildJobLogger;
+	PLibMCDataBuildJobIterator_GetCurrentJobPtr m_BuildJobIterator_GetCurrentJob;
+	PLibMCDataBuildJobHandler_CreateJobPtr m_BuildJobHandler_CreateJob;
+	PLibMCDataBuildJobHandler_RetrieveJobPtr m_BuildJobHandler_RetrieveJob;
+	PLibMCDataBuildJobHandler_ListJobsByStatusPtr m_BuildJobHandler_ListJobsByStatus;
+	PLibMCDataBuildJobHandler_ConvertBuildStatusToStringPtr m_BuildJobHandler_ConvertBuildStatusToString;
+	PLibMCDataBuildJobHandler_ConvertStringToBuildStatusPtr m_BuildJobHandler_ConvertStringToBuildStatus;
+	PLibMCDataDataModel_InitialiseDatabasePtr m_DataModel_InitialiseDatabase;
+	PLibMCDataDataModel_GetDataModelVersionPtr m_DataModel_GetDataModelVersion;
+	PLibMCDataDataModel_CreateStoragePtr m_DataModel_CreateStorage;
+	PLibMCDataDataModel_CreateBuildJobHandlerPtr m_DataModel_CreateBuildJobHandler;
+	PLibMCDataDataModel_CreateNewLogSessionPtr m_DataModel_CreateNewLogSession;
+	PLibMCDataGetVersionPtr m_GetVersion;
+	PLibMCDataGetLastErrorPtr m_GetLastError;
+	PLibMCDataReleaseInstancePtr m_ReleaseInstance;
+	PLibMCDataAcquireInstancePtr m_AcquireInstance;
+	PLibMCDataGetSymbolLookupMethodPtr m_GetSymbolLookupMethod;
+	PLibMCDataCreateDataModelInstancePtr m_CreateDataModelInstance;
+} sLibMCDataDynamicWrapperTable;
+
+/*************************************************************************************************************************
+ Load DLL dynamically
+**************************************************************************************************************************/
+LibMCDataResult InitLibMCDataWrapperTable(sLibMCDataDynamicWrapperTable * pWrapperTable);
+LibMCDataResult ReleaseLibMCDataWrapperTable(sLibMCDataDynamicWrapperTable * pWrapperTable);
+LibMCDataResult LoadLibMCDataWrapperTable(sLibMCDataDynamicWrapperTable * pWrapperTable, const char * pLibraryFileName);
+
+#endif // __LIBMCDATA_DYNAMICHEADER
+
diff --git a/Server/LibMC/libmcdata_types.h b/Server/LibMC/libmcdata_types.h
index b536419d..c52588c7 100644
--- a/Server/LibMC/libmcdata_types.h
+++ b/Server/LibMC/libmcdata_types.h
@@ -105,12 +105,98 @@ typedef void * LibMCData_pvoid;
 #define LIBMCDATA_ERROR_COULDNOTLOADLIBRARY 6
 #define LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT 7
 #define LIBMCDATA_ERROR_INCOMPATIBLEBINARYVERSION 8
+#define LIBMCDATA_ERROR_COULDNOTPARSECONFIGURATION 9
+#define LIBMCDATA_ERROR_DUPLICATESTATENAME 10
+#define LIBMCDATA_ERROR_STATENOTFOUND 11
+#define LIBMCDATA_ERROR_DUPLICATEOUTSTATE 12
+#define LIBMCDATA_ERROR_MISSINGMACHINEDEFINITION 13
+#define LIBMCDATA_ERROR_MISSINGINSTANCENAME 14
+#define LIBMCDATA_ERROR_DUPLICATEMACHINEINSTANCE 15
+#define LIBMCDATA_ERROR_MISSINGXMLSCHEMA 16
+#define LIBMCDATA_ERROR_INVALIDXMLSCHEMA 17
+#define LIBMCDATA_ERROR_MISSINGSTATENAME 18
+#define LIBMCDATA_ERROR_MISSINGOUTSTATETARGET 19
+#define LIBMCDATA_ERROR_INVALIDOUTSTATETARGET 20
+#define LIBMCDATA_ERROR_NOINITSTATE 21
+#define LIBMCDATA_ERROR_NOFAILEDSTATE 22
+#define LIBMCDATA_ERROR_INITSTATENOTFOUND 23
+#define LIBMCDATA_ERROR_FAILEDSTATENOTFOUND 24
+#define LIBMCDATA_ERROR_MISSINGINITSTATE 25
+#define LIBMCDATA_ERROR_MISSINGFAILEDSTATE 26
+#define LIBMCDATA_ERROR_MISSINGPLUGINNAME 27
+#define LIBMCDATA_ERROR_EMPTYINITSTATE 28
+#define LIBMCDATA_ERROR_EMPTYFAILEDSTATE 29
+#define LIBMCDATA_ERROR_EMPTYPLUGINNAME 30
+#define LIBMCDATA_ERROR_COULDNOTCREATESTATEFACTORY 31
+#define LIBMCDATA_ERROR_INVALIDSTATENAME 32
+#define LIBMCDATA_ERROR_COULDNOTCREATESTATE 33
+#define LIBMCDATA_ERROR_COULDNOTINITIALIZEFACTORY 34
+#define LIBMCDATA_ERROR_COULDNOTFINALIZEFACTORY 35
+#define LIBMCDATA_ERROR_COULDNOTLOADPLUGIN 36
+#define LIBMCDATA_ERROR_NOCURRENTSTATE 37
+#define LIBMCDATA_ERROR_NOPLUGINSTATE 38
+#define LIBMCDATA_ERROR_COULDNOTEXECUTEPLUGIN 39
+#define LIBMCDATA_ERROR_TOOMANYMACHINEINSTANCES 40
+#define LIBMCDATA_ERROR_INVALIDINDEX 41
+#define LIBMCDATA_ERROR_NOOUTSTATEGIVEN 42
+#define LIBMCDATA_ERROR_INVALIDOUTSTATEGIVEN 43
+#define LIBMCDATA_ERROR_INVALIDREPEATDELAY 44
+#define LIBMCDATA_ERROR_INVALIDEXECUTIONDELAY 45
+#define LIBMCDATA_ERROR_MISSINGREPEATDELAY 46
+#define LIBMCDATA_ERROR_THREADISRUNNING 47
+#define LIBMCDATA_ERROR_THREADISNOTRUNNING 48
+#define LIBMCDATA_ERROR_DUPLICATESIGNAL 49
+#define LIBMCDATA_ERROR_INVALIDSIGNALNAME 50
+#define LIBMCDATA_ERROR_MISSINGSIGNALNAME 51
+#define LIBMCDATA_ERROR_MISSINGSERVERNODE 52
+#define LIBMCDATA_ERROR_MISSINGHOSTNAME 53
+#define LIBMCDATA_ERROR_MISSINGPORT 54
+#define LIBMCDATA_ERROR_UUIDGENERATIONFAILED 55
+#define LIBMCDATA_ERROR_INVALIDBUFFERSIZE 56
+#define LIBMCDATA_ERROR_COULDNOTCONVERTTOUTF8 57
 #define LIBMCDATA_ERROR_NOCOLUMNAVAILABLE 58
 #define LIBMCDATA_ERROR_INVALIDTEXTCOLUMN 59
 #define LIBMCDATA_ERROR_INVALIDCOLUMNTYPE 60
+#define LIBMCDATA_ERROR_TOOMANYREQUESTEDLOGS 61
+#define LIBMCDATA_ERROR_MISSINGINSTANCEDESCRIPTION 62
+#define LIBMCDATA_ERROR_DUPLICATEPARAMETERGROUPNAME 63
+#define LIBMCDATA_ERROR_MISSINGPARAMETERGROUPNAME 64
+#define LIBMCDATA_ERROR_EMPTYPARAMETERGROUPNAME 65
+#define LIBMCDATA_ERROR_MISSINGPARAMETERGROUPDESCRIPTION 66
+#define LIBMCDATA_ERROR_EMPTYPARAMETERGROUPDESCRIPTION 67
+#define LIBMCDATA_ERROR_TOOMANYPARAMETERS 68
+#define LIBMCDATA_ERROR_TOOMANYPARAMETERGROUPS 69
+#define LIBMCDATA_ERROR_DUPLICATEPARAMETERNAME 70
+#define LIBMCDATA_ERROR_MISSINGPARAMETERNAME 71
+#define LIBMCDATA_ERROR_EMPTYPARAMETERNAME 72
+#define LIBMCDATA_ERROR_MISSINGPARAMETERDESCRIPTION 73
+#define LIBMCDATA_ERROR_EMPTYPARAMETERDESCRIPTION 74
+#define LIBMCDATA_ERROR_PARAMETERNOTFOUND 75
+#define LIBMCDATA_ERROR_MISSINGPARAMETERDEFAULTVALUE 76
+#define LIBMCDATA_ERROR_MISSINGDATACONFIGNODE 77
+#define LIBMCDATA_ERROR_MISSINGDIRECTORY 78
+#define LIBMCDATA_ERROR_MISSINGDATABASETYPE 79
+#define LIBMCDATA_ERROR_MISSINGSQLITEINFO 80
+#define LIBMCDATA_ERROR_UNKNOWNDATABASETYPE 81
+#define LIBMCDATA_ERROR_STORAGENOTINITIALISED 82
+#define LIBMCDATA_ERROR_COULDNOTCONVERTTOUTF16 83
+#define LIBMCDATA_ERROR_COULDNOTCREATEFILE 84
+#define LIBMCDATA_ERROR_COULDNOTSEEKSTREAM 85
+#define LIBMCDATA_ERROR_COULDNOTGETSTREAMPOSITION 86
+#define LIBMCDATA_ERROR_COULDNOTWRITESTREAM 87
 #define LIBMCDATA_ERROR_INVALIDDATABASEMIGRATION 88
 #define LIBMCDATA_ERROR_INTERNALERROR 89
-#define LIBMCDATA_ERROR_UNKNOWNDATABASETYPE 81
+#define LIBMCDATA_ERROR_COULDNOTSTORECONTENTSTREAM 90
+#define LIBMCDATA_ERROR_DATABASENOTINITIALISED 91
+#define LIBMCDATA_ERROR_PARAMETERGROUPNOTFOUND 92
+#define LIBMCDATA_ERROR_SIGNALNOTFOUND 93
+#define LIBMCDATA_ERROR_STATEMACHINENOTFOUND 94
+#define LIBMCDATA_ERROR_MISSINGPARAMETERTYPE 95
+#define LIBMCDATA_ERROR_INVALIDPARAMETERTYPE 96
+#define LIBMCDATA_ERROR_COULDNOTPARSEJSON 97
+#define LIBMCDATA_ERROR_INVALIDJSONFORMAT 98
+#define LIBMCDATA_ERROR_URLNOTFOUND 99
+#define LIBMCDATA_ERROR_GENERICBADREQUEST 100
 #define LIBMCDATA_ERROR_SQLITE_ERROR 101
 #define LIBMCDATA_ERROR_SQLITE_INTERNAL 102
 #define LIBMCDATA_ERROR_SQLITE_PERM 103
@@ -139,6 +225,45 @@ typedef void * LibMCData_pvoid;
 #define LIBMCDATA_ERROR_SQLITE_WARNING 128
 #define LIBMCDATA_ERROR_SQLITE_OTHER 130
 #define LIBMCDATA_ERROR_SQLITE_TOOMANYRESULTROWS 131
+#define LIBMCDATA_ERROR_COULDNOTREADZIPFILE 200
+#define LIBMCDATA_ERROR_COULDNOTOPENZIPFILE 201
+#define LIBMCDATA_ERROR_COULDNOTGETZIPENTRIES 202
+#define LIBMCDATA_ERROR_ZIPENTRYNOTFOUND 203
+#define LIBMCDATA_ERROR_COULDNOTSTATZIPENTRY 204
+#define LIBMCDATA_ERROR_COULDNOTOPENZIPENTRY 205
+#define LIBMCDATA_ERROR_COULDNOTREADZIPSTREAM 206
+#define LIBMCDATA_ERROR_COULDNOTREADFULLZIPDATA 207
+#define LIBMCDATA_ERROR_COULDNOTFINDDISTRIBUTIONINDEX 208
+#define LIBMCDATA_ERROR_COULDNOTPARSEDISTRIBUTIONINDEX 209
+#define LIBMCDATA_ERROR_EMPTYDISTRIBUTIONINDEX 210
+#define LIBMCDATA_ERROR_MISSINGDISTRIBUTIONINDEX 211
+#define LIBMCDATA_ERROR_MISSINGDISTRIBUTIONURL 212
+#define LIBMCDATA_ERROR_MISSINGDISTRIBUTIONFILENAME 213
+#define LIBMCDATA_ERROR_MISSINGDISTRIBUTIONSIZE 214
+#define LIBMCDATA_ERROR_MISSINGDISTRIBUTIONCONTENTTYPE 215
+#define LIBMCDATA_ERROR_DRIVERALREADYREGISTERED 216
+#define LIBMCDATA_ERROR_DRIVERNOTFOUND 217
+#define LIBMCDATA_ERROR_MISSINGDRIVERNAME 218
+#define LIBMCDATA_ERROR_MISSINGDRIVERTYPE 219
+#define LIBMCDATA_ERROR_MISSINGDRIVERLIBRARY 220
+#define LIBMCDATA_ERROR_DRIVERALREADYRESERVED 221
+#define LIBMCDATA_ERROR_LIBRARYPATHNOTFOUND 222
+#define LIBMCDATA_ERROR_TOOLPATHENTITYNOTLOADED 223
+#define LIBMCDATA_ERROR_TOOLPATHENTITYREFERENCEERROR 224
+#define LIBMCDATA_ERROR_TOOLPATHENTITYINVALIDFILE 225
+#define LIBMCDATA_ERROR_NO3MFLIBRARY 226
+#define LIBMCDATA_ERROR_INVALIDPOINTCOUNT 227
+#define LIBMCDATA_ERROR_DUPLICATEJOBUUID 228
+#define LIBMCDATA_ERROR_INVALIDJOBSTATUS 229
+#define LIBMCDATA_ERROR_INVALIDSTREAMCONTEXT 230
+#define LIBMCDATA_ERROR_JOBUUIDNOTFOUND 231
+#define LIBMCDATA_ERROR_INVALIDJOBNAME 232
+#define LIBMCDATA_ERROR_INVALIDJOBTIMESTAMP 233
+#define LIBMCDATA_ERROR_INVALIDUSERID 234
+#define LIBMCDATA_ERROR_INVALIDSTORAGECALLBACKSIGNATURE 235
+#define LIBMCDATA_ERROR_INVALIDSTORAGECALLBACKSTREAM 236
+#define LIBMCDATA_ERROR_INVALIDSTORAGEPATH 237
+#define LIBMCDATA_ERROR_STORAGESTREAMNOTFOUND 238
 
 /*************************************************************************************************************************
  Error strings for LibMCData
@@ -155,12 +280,98 @@ inline const char * LIBMCDATA_GETERRORSTRING (LibMCDataResult nErrorCode) {
     case LIBMCDATA_ERROR_COULDNOTLOADLIBRARY: return "the library could not be loaded";
     case LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT: return "a required exported symbol could not be found in the library";
     case LIBMCDATA_ERROR_INCOMPATIBLEBINARYVERSION: return "the version of the binary interface does not match the bindings interface";
+    case LIBMCDATA_ERROR_COULDNOTPARSECONFIGURATION: return "could not parse configuration";
+    case LIBMCDATA_ERROR_DUPLICATESTATENAME: return "duplicate state name";
+    case LIBMCDATA_ERROR_STATENOTFOUND: return "state not found";
+    case LIBMCDATA_ERROR_DUPLICATEOUTSTATE: return "duplicate out state";
+    case LIBMCDATA_ERROR_MISSINGMACHINEDEFINITION: return "missing machine definition";
+    case LIBMCDATA_ERROR_MISSINGINSTANCENAME: return "missing instance name";
+    case LIBMCDATA_ERROR_DUPLICATEMACHINEINSTANCE: return "duplicate machine instance";
+    case LIBMCDATA_ERROR_MISSINGXMLSCHEMA: return "missing XML schema";
+    case LIBMCDATA_ERROR_INVALIDXMLSCHEMA: return "invalid XML schema";
+    case LIBMCDATA_ERROR_MISSINGSTATENAME: return "missing state name";
+    case LIBMCDATA_ERROR_MISSINGOUTSTATETARGET: return "missing outstate target";
+    case LIBMCDATA_ERROR_INVALIDOUTSTATETARGET: return "invalid outstate target";
+    case LIBMCDATA_ERROR_NOINITSTATE: return "no init state";
+    case LIBMCDATA_ERROR_NOFAILEDSTATE: return "no failed state";
+    case LIBMCDATA_ERROR_INITSTATENOTFOUND: return "init state not found";
+    case LIBMCDATA_ERROR_FAILEDSTATENOTFOUND: return "failed state not found";
+    case LIBMCDATA_ERROR_MISSINGINITSTATE: return "missing init state";
+    case LIBMCDATA_ERROR_MISSINGFAILEDSTATE: return "missing failed state";
+    case LIBMCDATA_ERROR_MISSINGPLUGINNAME: return "missing plugin name";
+    case LIBMCDATA_ERROR_EMPTYINITSTATE: return "empty init state";
+    case LIBMCDATA_ERROR_EMPTYFAILEDSTATE: return "empty failed state";
+    case LIBMCDATA_ERROR_EMPTYPLUGINNAME: return "empty plugin name";
+    case LIBMCDATA_ERROR_COULDNOTCREATESTATEFACTORY: return "could not create state factory";
+    case LIBMCDATA_ERROR_INVALIDSTATENAME: return "invalid state name";
+    case LIBMCDATA_ERROR_COULDNOTCREATESTATE: return "could not create state";
+    case LIBMCDATA_ERROR_COULDNOTINITIALIZEFACTORY: return "could not initialize factory";
+    case LIBMCDATA_ERROR_COULDNOTFINALIZEFACTORY: return "could not finalize factory";
+    case LIBMCDATA_ERROR_COULDNOTLOADPLUGIN: return "could not load plugin";
+    case LIBMCDATA_ERROR_NOCURRENTSTATE: return "no current state";
+    case LIBMCDATA_ERROR_NOPLUGINSTATE: return "no plugin state";
+    case LIBMCDATA_ERROR_COULDNOTEXECUTEPLUGIN: return "could not execute plugin";
+    case LIBMCDATA_ERROR_TOOMANYMACHINEINSTANCES: return "too many machine instances";
+    case LIBMCDATA_ERROR_INVALIDINDEX: return "invalid index";
+    case LIBMCDATA_ERROR_NOOUTSTATEGIVEN: return "no new outstate has been given";
+    case LIBMCDATA_ERROR_INVALIDOUTSTATEGIVEN: return "invalid outstate has been given";
+    case LIBMCDATA_ERROR_INVALIDREPEATDELAY: return "invalid repeat delay";
+    case LIBMCDATA_ERROR_INVALIDEXECUTIONDELAY: return "invalid execution delay";
+    case LIBMCDATA_ERROR_MISSINGREPEATDELAY: return "missing repeat delay";
+    case LIBMCDATA_ERROR_THREADISRUNNING: return "thread is running";
+    case LIBMCDATA_ERROR_THREADISNOTRUNNING: return "thread is not running";
+    case LIBMCDATA_ERROR_DUPLICATESIGNAL: return "duplicate signal";
+    case LIBMCDATA_ERROR_INVALIDSIGNALNAME: return "invalid signal name";
+    case LIBMCDATA_ERROR_MISSINGSIGNALNAME: return "missing signal name";
+    case LIBMCDATA_ERROR_MISSINGSERVERNODE: return "missing server node";
+    case LIBMCDATA_ERROR_MISSINGHOSTNAME: return "missing host name";
+    case LIBMCDATA_ERROR_MISSINGPORT: return "missing port";
+    case LIBMCDATA_ERROR_UUIDGENERATIONFAILED: return "uuid generation failed";
+    case LIBMCDATA_ERROR_INVALIDBUFFERSIZE: return "invalid buffer size";
+    case LIBMCDATA_ERROR_COULDNOTCONVERTTOUTF8: return "could not convert to utf8";
     case LIBMCDATA_ERROR_NOCOLUMNAVAILABLE: return "no column available";
     case LIBMCDATA_ERROR_INVALIDTEXTCOLUMN: return "invalid text column";
     case LIBMCDATA_ERROR_INVALIDCOLUMNTYPE: return "invalid column type";
+    case LIBMCDATA_ERROR_TOOMANYREQUESTEDLOGS: return "too many requested logs";
+    case LIBMCDATA_ERROR_MISSINGINSTANCEDESCRIPTION: return "missing instance description";
+    case LIBMCDATA_ERROR_DUPLICATEPARAMETERGROUPNAME: return "duplicate parameter group name";
+    case LIBMCDATA_ERROR_MISSINGPARAMETERGROUPNAME: return "missing parameter group name";
+    case LIBMCDATA_ERROR_EMPTYPARAMETERGROUPNAME: return "empty parameter group name";
+    case LIBMCDATA_ERROR_MISSINGPARAMETERGROUPDESCRIPTION: return "missing parameter group description";
+    case LIBMCDATA_ERROR_EMPTYPARAMETERGROUPDESCRIPTION: return "empty parameter group description";
+    case LIBMCDATA_ERROR_TOOMANYPARAMETERS: return "too many parameters";
+    case LIBMCDATA_ERROR_TOOMANYPARAMETERGROUPS: return "too many parameter groups";
+    case LIBMCDATA_ERROR_DUPLICATEPARAMETERNAME: return "duplicate parameter name";
+    case LIBMCDATA_ERROR_MISSINGPARAMETERNAME: return "missing parameter name";
+    case LIBMCDATA_ERROR_EMPTYPARAMETERNAME: return "empty parameter name";
+    case LIBMCDATA_ERROR_MISSINGPARAMETERDESCRIPTION: return "missing parameter description";
+    case LIBMCDATA_ERROR_EMPTYPARAMETERDESCRIPTION: return "empty parameter description";
+    case LIBMCDATA_ERROR_PARAMETERNOTFOUND: return "parameter not found";
+    case LIBMCDATA_ERROR_MISSINGPARAMETERDEFAULTVALUE: return "missing parameter default value";
+    case LIBMCDATA_ERROR_MISSINGDATACONFIGNODE: return "missing data config node";
+    case LIBMCDATA_ERROR_MISSINGDIRECTORY: return "missing directory";
+    case LIBMCDATA_ERROR_MISSINGDATABASETYPE: return "missing database type";
+    case LIBMCDATA_ERROR_MISSINGSQLITEINFO: return "missing sqlite info";
+    case LIBMCDATA_ERROR_UNKNOWNDATABASETYPE: return "unknown database type";
+    case LIBMCDATA_ERROR_STORAGENOTINITIALISED: return "storage not initialised";
+    case LIBMCDATA_ERROR_COULDNOTCONVERTTOUTF16: return "could not convert to utf 16";
+    case LIBMCDATA_ERROR_COULDNOTCREATEFILE: return "could not create file";
+    case LIBMCDATA_ERROR_COULDNOTSEEKSTREAM: return "could not seek stream";
+    case LIBMCDATA_ERROR_COULDNOTGETSTREAMPOSITION: return "could not get stream position";
+    case LIBMCDATA_ERROR_COULDNOTWRITESTREAM: return "could not write stream";
     case LIBMCDATA_ERROR_INVALIDDATABASEMIGRATION: return "invalid database migration";
     case LIBMCDATA_ERROR_INTERNALERROR: return "internal error";
-    case LIBMCDATA_ERROR_UNKNOWNDATABASETYPE: return "unknown database type";
+    case LIBMCDATA_ERROR_COULDNOTSTORECONTENTSTREAM: return "could not store content stream";
+    case LIBMCDATA_ERROR_DATABASENOTINITIALISED: return "database not initialised";
+    case LIBMCDATA_ERROR_PARAMETERGROUPNOTFOUND: return "parameter group not found";
+    case LIBMCDATA_ERROR_SIGNALNOTFOUND: return "signal not found";
+    case LIBMCDATA_ERROR_STATEMACHINENOTFOUND: return "state machine not found.";
+    case LIBMCDATA_ERROR_MISSINGPARAMETERTYPE: return "missing parameter type.";
+    case LIBMCDATA_ERROR_INVALIDPARAMETERTYPE: return "invalid parameter type.";
+    case LIBMCDATA_ERROR_COULDNOTPARSEJSON: return "could not parse json.";
+    case LIBMCDATA_ERROR_INVALIDJSONFORMAT: return "invalid json format.";
+    case LIBMCDATA_ERROR_URLNOTFOUND: return "url not found.";
+    case LIBMCDATA_ERROR_GENERICBADREQUEST: return "generic bad request.";
     case LIBMCDATA_ERROR_SQLITE_ERROR: return "SQLite: Generic Error";
     case LIBMCDATA_ERROR_SQLITE_INTERNAL: return "SQLite: Internal logic error in SQLite";
     case LIBMCDATA_ERROR_SQLITE_PERM: return "SQLite: Access permission denied";
@@ -189,6 +400,45 @@ inline const char * LIBMCDATA_GETERRORSTRING (LibMCDataResult nErrorCode) {
     case LIBMCDATA_ERROR_SQLITE_WARNING: return "SQLite: Warnings from sqlite3_log";
     case LIBMCDATA_ERROR_SQLITE_OTHER: return "SQLite: Other Error";
     case LIBMCDATA_ERROR_SQLITE_TOOMANYRESULTROWS: return "too many result rows";
+    case LIBMCDATA_ERROR_COULDNOTREADZIPFILE: return "Could not read ZIP file";
+    case LIBMCDATA_ERROR_COULDNOTOPENZIPFILE: return "Could not open ZIP file";
+    case LIBMCDATA_ERROR_COULDNOTGETZIPENTRIES: return "Could not get ZIP file entries";
+    case LIBMCDATA_ERROR_ZIPENTRYNOTFOUND: return "ZIP Entry not found";
+    case LIBMCDATA_ERROR_COULDNOTSTATZIPENTRY: return "Could not stat ZIP entry";
+    case LIBMCDATA_ERROR_COULDNOTOPENZIPENTRY: return "Could not open ZIP entry";
+    case LIBMCDATA_ERROR_COULDNOTREADZIPSTREAM: return "Could not read ZIP stream";
+    case LIBMCDATA_ERROR_COULDNOTREADFULLZIPDATA: return "Could not read full zip data";
+    case LIBMCDATA_ERROR_COULDNOTFINDDISTRIBUTIONINDEX: return "Could not find distribution index.";
+    case LIBMCDATA_ERROR_COULDNOTPARSEDISTRIBUTIONINDEX: return "Could not parse distribution index.";
+    case LIBMCDATA_ERROR_EMPTYDISTRIBUTIONINDEX: return "Empty distribution index.";
+    case LIBMCDATA_ERROR_MISSINGDISTRIBUTIONINDEX: return "Missing distribution index.";
+    case LIBMCDATA_ERROR_MISSINGDISTRIBUTIONURL: return "Missing distribution url.";
+    case LIBMCDATA_ERROR_MISSINGDISTRIBUTIONFILENAME: return "Missing distribution filename.";
+    case LIBMCDATA_ERROR_MISSINGDISTRIBUTIONSIZE: return "Missing distribution size.";
+    case LIBMCDATA_ERROR_MISSINGDISTRIBUTIONCONTENTTYPE: return "Missing distribution content type.";
+    case LIBMCDATA_ERROR_DRIVERALREADYREGISTERED: return "Driver already registered.";
+    case LIBMCDATA_ERROR_DRIVERNOTFOUND: return "Driver not found.";
+    case LIBMCDATA_ERROR_MISSINGDRIVERNAME: return "Missing driver name.";
+    case LIBMCDATA_ERROR_MISSINGDRIVERTYPE: return "Missing driver type.";
+    case LIBMCDATA_ERROR_MISSINGDRIVERLIBRARY: return "Missing driver library.";
+    case LIBMCDATA_ERROR_DRIVERALREADYRESERVED: return "Driver has already been reserved by an instance.";
+    case LIBMCDATA_ERROR_LIBRARYPATHNOTFOUND: return "Library path not found.";
+    case LIBMCDATA_ERROR_TOOLPATHENTITYNOTLOADED: return "Toolpath entity not loaded";
+    case LIBMCDATA_ERROR_TOOLPATHENTITYREFERENCEERROR: return "Toolpath entity reference error";
+    case LIBMCDATA_ERROR_TOOLPATHENTITYINVALIDFILE: return "Toolpath entity is invalid";
+    case LIBMCDATA_ERROR_NO3MFLIBRARY: return "No 3MF Library specified";
+    case LIBMCDATA_ERROR_INVALIDPOINTCOUNT: return "Invalid point count";
+    case LIBMCDATA_ERROR_DUPLICATEJOBUUID: return "Duplicate job uuid";
+    case LIBMCDATA_ERROR_INVALIDJOBSTATUS: return "Invalid job status";
+    case LIBMCDATA_ERROR_INVALIDSTREAMCONTEXT: return "Invalid stream context";
+    case LIBMCDATA_ERROR_JOBUUIDNOTFOUND: return "Job uuid not found";
+    case LIBMCDATA_ERROR_INVALIDJOBNAME: return "Invalid job name";
+    case LIBMCDATA_ERROR_INVALIDJOBTIMESTAMP: return "Invalid job timestamp";
+    case LIBMCDATA_ERROR_INVALIDUSERID: return "Invalid job name";
+    case LIBMCDATA_ERROR_INVALIDSTORAGECALLBACKSIGNATURE: return "Invalid storage callback signature";
+    case LIBMCDATA_ERROR_INVALIDSTORAGECALLBACKSTREAM: return "Invalid storage callback stream";
+    case LIBMCDATA_ERROR_INVALIDSTORAGEPATH: return "Invalid storage path";
+    case LIBMCDATA_ERROR_STORAGESTREAMNOTFOUND: return "Storage Stream not found";
     default: return "unknown error";
   }
 }
@@ -198,10 +448,13 @@ inline const char * LIBMCDATA_GETERRORSTRING (LibMCDataResult nErrorCode) {
 **************************************************************************************************************************/
 
 typedef LibMCDataHandle LibMCData_Base;
+typedef LibMCDataHandle LibMCData_Iterator;
+typedef LibMCDataHandle LibMCData_LogSession;
 typedef LibMCDataHandle LibMCData_StorageStream;
-typedef LibMCDataHandle LibMCData_StorageEntity;
 typedef LibMCDataHandle LibMCData_Storage;
-typedef LibMCDataHandle LibMCData_LogSession;
+typedef LibMCDataHandle LibMCData_BuildJob;
+typedef LibMCDataHandle LibMCData_BuildJobIterator;
+typedef LibMCDataHandle LibMCData_BuildJobHandler;
 typedef LibMCDataHandle LibMCData_DataModel;
 
 /*************************************************************************************************************************
@@ -209,13 +462,13 @@ typedef LibMCDataHandle LibMCData_DataModel;
 **************************************************************************************************************************/
 
 typedef enum eLibMCDataLogLevel {
-  eLogLevelFatalError = 1,
-  eLogLevelCriticalError = 2,
-  eLogLevelWarning = 3,
-  eLogLevelMessage = 4,
-  eLogLevelInfo = 5,
-  eLogLevelDebug = 6,
-  eLogLevelUnknown = 7
+  eLibMCDataLogLevelFatalError = 1,
+  eLibMCDataLogLevelCriticalError = 2,
+  eLibMCDataLogLevelWarning = 3,
+  eLibMCDataLogLevelMessage = 4,
+  eLibMCDataLogLevelInfo = 5,
+  eLibMCDataLogLevelDebug = 6,
+  eLibMCDataLogLevelUnknown = 7
 } eLibMCDataLogLevel;
 
 typedef enum eLibMCDataDataBaseType {
@@ -223,6 +476,13 @@ typedef enum eLibMCDataDataBaseType {
   eDataBaseTypeSqLite = 1
 } eLibMCDataDataBaseType;
 
+typedef enum eLibMCDataBuildJobStatus {
+  eBuildJobStatusCreated = 0,
+  eBuildJobStatusValidating = 100,
+  eBuildJobStatusValidated = 200,
+  eBuildJobStatusArchived = 300
+} eLibMCDataBuildJobStatus;
+
 /*************************************************************************************************************************
  Declaration of enum members for 4 byte struct alignment
 **************************************************************************************************************************/
@@ -237,5 +497,33 @@ typedef union {
   int m_code;
 } structEnumLibMCDataDataBaseType;
 
+typedef union {
+  eLibMCDataBuildJobStatus m_enum;
+  int m_code;
+} structEnumLibMCDataBuildJobStatus;
+
+/*************************************************************************************************************************
+ Declaration of function pointers 
+**************************************************************************************************************************/
+
+/**
+* LibMCDataStreamReadCallback - Callback to call for reading a data chunk
+*
+* @param[in] pByteData - Pointer to a buffer to read data into
+* @param[in] nNumBytes - Number of bytes to read
+* @param[in] pStreamHandle - Handle of the stream to read.
+* @param[out] pErrorCode - LibMCData return code (0 for success)
+*/
+typedef void(*LibMCDataStreamReadCallback)(LibMCData_pvoid, LibMCData_uint64, LibMCData_pvoid, LibMCData_uint32 *);
+
+/**
+* LibMCDataStreamSeekCallback - Callback to call for seeking in the stream
+*
+* @param[in] nPosition - Position in the stream to move to
+* @param[in] pStreamHandle - Handle of the stream to read.
+* @param[out] pErrorCode - LibMCData return code (0 for success)
+*/
+typedef void(*LibMCDataStreamSeekCallback)(LibMCData_uint64, LibMCData_pvoid, LibMCData_uint32 *);
+
 
 #endif // __LIBMCDATA_TYPES_HEADER
diff --git a/Server/LibMCData/libmcdata.go b/Server/LibMCData/libmcdata.go
index 69d92f37..20d1e3f6 100644
--- a/Server/LibMCData/libmcdata.go
+++ b/Server/LibMCData/libmcdata.go
@@ -41,6 +41,8 @@ Interface version: 1.0.0
 package libmcdata
 
 /*
+#cgo linux LDFLAGS: -ldl
+
 #include "libmcdata_dynamic.cc"
 
 LibMCDataHandle loadLibMCDataLibrary (const char * pFileName)
@@ -137,13 +139,6 @@ LibMCDataResult CCall_libmcdata_storagestream_getuuid(LibMCDataHandle libraryHan
 }
 
 
-LibMCDataResult CCall_libmcdata_storagestream_getcontextuuid(LibMCDataHandle libraryHandle, LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nContextUUIDBufferSize, LibMCData_uint32* pContextUUIDNeededChars, char * pContextUUIDBuffer)
-{
-	if (libraryHandle == 0) 
-		return LIBMCDATA_ERROR_INVALIDCAST;
-	sLibMCDataDynamicWrapperTable * wrapperTable = (sLibMCDataDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_StorageStream_GetContextUUID (pStorageStream, nContextUUIDBufferSize, pContextUUIDNeededChars, pContextUUIDBuffer);	
-}
 
 
 LibMCDataResult CCall_libmcdata_storagestream_gettimestamp(LibMCDataHandle libraryHandle, LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nTimestampBufferSize, LibMCData_uint32* pTimestampNeededChars, char * pTimestampBuffer)
@@ -209,41 +204,6 @@ LibMCDataResult CCall_libmcdata_storagestream_getcallbacks(LibMCDataHandle libra
 }
 
 
-LibMCDataResult CCall_libmcdata_storage_storenewstream(LibMCDataHandle libraryHandle, LibMCData_Storage pStorage, const char * pUUID, const char * pContextUUID, const char * pName, const char * pMimeType, LibMCData_uint64 nContentBufferSize, const LibMCData_uint8 * pContentBuffer, const char * pUserID, LibMCData_StorageStream * pStreamInstance)
-{
-	if (libraryHandle == 0) 
-		return LIBMCDATA_ERROR_INVALIDCAST;
-	sLibMCDataDynamicWrapperTable * wrapperTable = (sLibMCDataDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_Storage_StoreNewStream (pStorage, pUUID, pContextUUID, pName, pMimeType, nContentBufferSize, pContentBuffer, pUserID, pStreamInstance);	
-}
-
-
-LibMCDataResult CCall_libmcdata_storage_beginpartialstream(LibMCDataHandle libraryHandle, LibMCData_Storage pStorage, const char * pUUID, const char * pContextUUID, const char * pName, const char * pMimeType, LibMCData_uint64 nSize)
-{
-	if (libraryHandle == 0) 
-		return LIBMCDATA_ERROR_INVALIDCAST;
-	sLibMCDataDynamicWrapperTable * wrapperTable = (sLibMCDataDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_Storage_BeginPartialStream (pStorage, pUUID, pContextUUID, pName, pMimeType, nSize);	
-}
-
-
-LibMCDataResult CCall_libmcdata_storage_storepartialstream(LibMCDataHandle libraryHandle, LibMCData_Storage pStorage, const char * pUUID, LibMCData_uint64 nOffset, LibMCData_uint64 nContentBufferSize, const LibMCData_uint8 * pContentBuffer)
-{
-	if (libraryHandle == 0) 
-		return LIBMCDATA_ERROR_INVALIDCAST;
-	sLibMCDataDynamicWrapperTable * wrapperTable = (sLibMCDataDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_Storage_StorePartialStream (pStorage, pUUID, nOffset, nContentBufferSize, pContentBuffer);	
-}
-
-
-LibMCDataResult CCall_libmcdata_storage_finishpartialstream(LibMCDataHandle libraryHandle, LibMCData_Storage pStorage, const char * pUUID, const char * pSHA2, LibMCData_StorageStream * pStreamInstance)
-{
-	if (libraryHandle == 0) 
-		return LIBMCDATA_ERROR_INVALIDCAST;
-	sLibMCDataDynamicWrapperTable * wrapperTable = (sLibMCDataDynamicWrapperTable *) libraryHandle;
-	return wrapperTable->m_Storage_FinishPartialStream (pStorage, pUUID, pSHA2, pStreamInstance);	
-}
-
 
 LibMCDataResult CCall_libmcdata_buildjob_getuuid(LibMCDataHandle libraryHandle, LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nUUIDBufferSize, LibMCData_uint32* pUUIDNeededChars, char * pUUIDBuffer)
 {
@@ -1161,22 +1121,6 @@ func (inst StorageStream) GetUUID() (string, error) {
 	return string(bufferuUID[:(filledinuUID-1)]), nil
 }
 
-// GetContextUUID returns the context uuid of a storage stream. Context might be for example a project uuid that this stream is part of.
-func (inst StorageStream) GetContextUUID() (string, error) {
-	var neededforcontextUUID C.uint32_t
-	var filledincontextUUID C.uint32_t
-	ret := C.CCall_libmcdata_storagestream_getcontextuuid(inst.wrapperRef.LibraryHandle, inst.Ref, 0, &neededforcontextUUID, nil)
-	if ret != 0 {
-		return "", makeError(uint32(ret))
-	}
-	bufferSizecontextUUID := neededforcontextUUID
-	buffercontextUUID := make([]byte, bufferSizecontextUUID)
-	ret = C.CCall_libmcdata_storagestream_getcontextuuid(inst.wrapperRef.LibraryHandle, inst.Ref, bufferSizecontextUUID, &filledincontextUUID, (*C.char)(unsafe.Pointer(&buffercontextUUID[0])))
-	if ret != 0 {
-		return "", makeError(uint32(ret))
-	}
-	return string(buffercontextUUID[:(filledincontextUUID-1)]), nil
-}
 
 // GetTimeStamp returns the timestamp of a storage stream.
 func (inst StorageStream) GetTimeStamp() (string, error) {
@@ -1294,44 +1238,6 @@ type Storage struct {
 func (wrapper * Wrapper) NewStorage(r ref) Storage {
 	return Storage{wrapper.NewBase(r)}
 }
-// StoreNewStream stores a new stream.
-func (inst Storage) StoreNewStream(uUID string, contextUUID string, name string, mimeType string, content []uint8, userID string) (StorageStream, error) {
-	var streamInstance ref
-	ret := C.CCall_libmcdata_storage_storenewstream(inst.wrapperRef.LibraryHandle, inst.Ref, (*C.char)(unsafe.Pointer(&[]byte(uUID)[0])), (*C.char)(unsafe.Pointer(&[]byte(contextUUID)[0])), (*C.char)(unsafe.Pointer(&[]byte(name)[0])), (*C.char)(unsafe.Pointer(&[]byte(mimeType)[0])), C.uint64_t(len(content)), (*C.uint8_t)(unsafe.Pointer(&content[0])), (*C.char)(unsafe.Pointer(&[]byte(userID)[0])), &streamInstance)
-	if ret != 0 {
-		return StorageStream{}, makeError(uint32(ret))
-	}
-	return inst.wrapperRef.NewStorageStream(streamInstance), nil
-}
-
-// BeginPartialStream starts storing a stream with partial uploads.
-func (inst Storage) BeginPartialStream(uUID string, contextUUID string, name string, mimeType string, size uint64) error {
-	ret := C.CCall_libmcdata_storage_beginpartialstream(inst.wrapperRef.LibraryHandle, inst.Ref, (*C.char)(unsafe.Pointer(&[]byte(uUID)[0])), (*C.char)(unsafe.Pointer(&[]byte(contextUUID)[0])), (*C.char)(unsafe.Pointer(&[]byte(name)[0])), (*C.char)(unsafe.Pointer(&[]byte(mimeType)[0])), C.uint64_t(size))
-	if ret != 0 {
-		return makeError(uint32(ret))
-	}
-	return nil
-}
-
-// StorePartialStream stores data in a stream with partial uploads. Uploads should be sequential for optimal performance, but may be in arbitrary order.
-func (inst Storage) StorePartialStream(uUID string, offset uint64, content []uint8) error {
-	ret := C.CCall_libmcdata_storage_storepartialstream(inst.wrapperRef.LibraryHandle, inst.Ref, (*C.char)(unsafe.Pointer(&[]byte(uUID)[0])), C.uint64_t(offset), C.uint64_t(len(content)), (*C.uint8_t)(unsafe.Pointer(&content[0])))
-	if ret != 0 {
-		return makeError(uint32(ret))
-	}
-	return nil
-}
-
-// FinishPartialStream finishes storing a stream.
-func (inst Storage) FinishPartialStream(uUID string, sHA2 string) (StorageStream, error) {
-	var streamInstance ref
-	ret := C.CCall_libmcdata_storage_finishpartialstream(inst.wrapperRef.LibraryHandle, inst.Ref, (*C.char)(unsafe.Pointer(&[]byte(uUID)[0])), (*C.char)(unsafe.Pointer(&[]byte(sHA2)[0])), &streamInstance)
-	if ret != 0 {
-		return StorageStream{}, makeError(uint32(ret))
-	}
-	return inst.wrapperRef.NewStorageStream(streamInstance), nil
-}
-
 
 // BuildJob represents a LibMCData class.
 type BuildJob struct {
diff --git a/Server/LibMCData/libmcdata_dynamic.cc b/Server/LibMCData/libmcdata_dynamic.cc
index ebe2d43e..c071adbe 100644
--- a/Server/LibMCData/libmcdata_dynamic.cc
+++ b/Server/LibMCData/libmcdata_dynamic.cc
@@ -58,7 +58,6 @@ LibMCDataResult InitLibMCDataWrapperTable(sLibMCDataDynamicWrapperTable * pWrapp
 	pWrapperTable->m_Iterator_Count = NULL;
 	pWrapperTable->m_LogSession_AddEntry = NULL;
 	pWrapperTable->m_StorageStream_GetUUID = NULL;
-	pWrapperTable->m_StorageStream_GetContextUUID = NULL;
 	pWrapperTable->m_StorageStream_GetTimeStamp = NULL;
 	pWrapperTable->m_StorageStream_GetName = NULL;
 	pWrapperTable->m_StorageStream_GetMIMEType = NULL;
@@ -66,16 +65,37 @@ LibMCDataResult InitLibMCDataWrapperTable(sLibMCDataDynamicWrapperTable * pWrapp
 	pWrapperTable->m_StorageStream_GetSize = NULL;
 	pWrapperTable->m_StorageStream_GetContent = NULL;
 	pWrapperTable->m_StorageStream_GetCallbacks = NULL;
+	pWrapperTable->m_Storage_StreamIsReady = NULL;
+	pWrapperTable->m_Storage_RetrieveStream = NULL;
 	pWrapperTable->m_Storage_StoreNewStream = NULL;
 	pWrapperTable->m_Storage_BeginPartialStream = NULL;
 	pWrapperTable->m_Storage_StorePartialStream = NULL;
 	pWrapperTable->m_Storage_FinishPartialStream = NULL;
+	pWrapperTable->m_Storage_GetMaxStreamSize = NULL;
+	pWrapperTable->m_Storage_ContentTypeIsAccepted = NULL;
+	pWrapperTable->m_BuildJobData_GetName = NULL;
+	pWrapperTable->m_BuildJobData_GetTimeStamp = NULL;
+	pWrapperTable->m_BuildJobData_GetStorageStream = NULL;
+	pWrapperTable->m_BuildJobData_GetDataType = NULL;
+	pWrapperTable->m_BuildJobData_GetMIMEType = NULL;
+	pWrapperTable->m_BuildJobDataIterator_GetCurrentJobData = NULL;
 	pWrapperTable->m_BuildJob_GetUUID = NULL;
 	pWrapperTable->m_BuildJob_GetName = NULL;
 	pWrapperTable->m_BuildJob_GetStatus = NULL;
+	pWrapperTable->m_BuildJob_GetLayerCount = NULL;
 	pWrapperTable->m_BuildJob_GetTimeStamp = NULL;
 	pWrapperTable->m_BuildJob_GetStorageStream = NULL;
+	pWrapperTable->m_BuildJob_GetStorageStreamUUID = NULL;
 	pWrapperTable->m_BuildJob_GetBuildJobLogger = NULL;
+	pWrapperTable->m_BuildJob_StartValidating = NULL;
+	pWrapperTable->m_BuildJob_FinishValidating = NULL;
+	pWrapperTable->m_BuildJob_ArchiveJob = NULL;
+	pWrapperTable->m_BuildJob_UnArchiveJob = NULL;
+	pWrapperTable->m_BuildJob_DeleteJob = NULL;
+	pWrapperTable->m_BuildJob_JobCanBeArchived = NULL;
+	pWrapperTable->m_BuildJob_AddJobData = NULL;
+	pWrapperTable->m_BuildJob_ListJobDataByType = NULL;
+	pWrapperTable->m_BuildJob_ListJobData = NULL;
 	pWrapperTable->m_BuildJobIterator_GetCurrentJob = NULL;
 	pWrapperTable->m_BuildJobHandler_CreateJob = NULL;
 	pWrapperTable->m_BuildJobHandler_RetrieveJob = NULL;
@@ -208,15 +228,6 @@ LibMCDataResult LoadLibMCDataWrapperTable(sLibMCDataDynamicWrapperTable * pWrapp
 	if (pWrapperTable->m_StorageStream_GetUUID == NULL)
 		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 	
-	#ifdef _WIN32
-	pWrapperTable->m_StorageStream_GetContextUUID = (PLibMCDataStorageStream_GetContextUUIDPtr) GetProcAddress(hLibrary, "libmcdata_storagestream_getcontextuuid");
-	#else // _WIN32
-	pWrapperTable->m_StorageStream_GetContextUUID = (PLibMCDataStorageStream_GetContextUUIDPtr) dlsym(hLibrary, "libmcdata_storagestream_getcontextuuid");
-	dlerror();
-	#endif // _WIN32
-	if (pWrapperTable->m_StorageStream_GetContextUUID == NULL)
-		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
-	
 	#ifdef _WIN32
 	pWrapperTable->m_StorageStream_GetTimeStamp = (PLibMCDataStorageStream_GetTimeStampPtr) GetProcAddress(hLibrary, "libmcdata_storagestream_gettimestamp");
 	#else // _WIN32
@@ -280,6 +291,24 @@ LibMCDataResult LoadLibMCDataWrapperTable(sLibMCDataDynamicWrapperTable * pWrapp
 	if (pWrapperTable->m_StorageStream_GetCallbacks == NULL)
 		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 	
+	#ifdef _WIN32
+	pWrapperTable->m_Storage_StreamIsReady = (PLibMCDataStorage_StreamIsReadyPtr) GetProcAddress(hLibrary, "libmcdata_storage_streamisready");
+	#else // _WIN32
+	pWrapperTable->m_Storage_StreamIsReady = (PLibMCDataStorage_StreamIsReadyPtr) dlsym(hLibrary, "libmcdata_storage_streamisready");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_Storage_StreamIsReady == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_Storage_RetrieveStream = (PLibMCDataStorage_RetrieveStreamPtr) GetProcAddress(hLibrary, "libmcdata_storage_retrievestream");
+	#else // _WIN32
+	pWrapperTable->m_Storage_RetrieveStream = (PLibMCDataStorage_RetrieveStreamPtr) dlsym(hLibrary, "libmcdata_storage_retrievestream");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_Storage_RetrieveStream == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
 	#ifdef _WIN32
 	pWrapperTable->m_Storage_StoreNewStream = (PLibMCDataStorage_StoreNewStreamPtr) GetProcAddress(hLibrary, "libmcdata_storage_storenewstream");
 	#else // _WIN32
@@ -316,6 +345,78 @@ LibMCDataResult LoadLibMCDataWrapperTable(sLibMCDataDynamicWrapperTable * pWrapp
 	if (pWrapperTable->m_Storage_FinishPartialStream == NULL)
 		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 	
+	#ifdef _WIN32
+	pWrapperTable->m_Storage_GetMaxStreamSize = (PLibMCDataStorage_GetMaxStreamSizePtr) GetProcAddress(hLibrary, "libmcdata_storage_getmaxstreamsize");
+	#else // _WIN32
+	pWrapperTable->m_Storage_GetMaxStreamSize = (PLibMCDataStorage_GetMaxStreamSizePtr) dlsym(hLibrary, "libmcdata_storage_getmaxstreamsize");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_Storage_GetMaxStreamSize == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_Storage_ContentTypeIsAccepted = (PLibMCDataStorage_ContentTypeIsAcceptedPtr) GetProcAddress(hLibrary, "libmcdata_storage_contenttypeisaccepted");
+	#else // _WIN32
+	pWrapperTable->m_Storage_ContentTypeIsAccepted = (PLibMCDataStorage_ContentTypeIsAcceptedPtr) dlsym(hLibrary, "libmcdata_storage_contenttypeisaccepted");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_Storage_ContentTypeIsAccepted == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJobData_GetName = (PLibMCDataBuildJobData_GetNamePtr) GetProcAddress(hLibrary, "libmcdata_buildjobdata_getname");
+	#else // _WIN32
+	pWrapperTable->m_BuildJobData_GetName = (PLibMCDataBuildJobData_GetNamePtr) dlsym(hLibrary, "libmcdata_buildjobdata_getname");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJobData_GetName == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJobData_GetTimeStamp = (PLibMCDataBuildJobData_GetTimeStampPtr) GetProcAddress(hLibrary, "libmcdata_buildjobdata_gettimestamp");
+	#else // _WIN32
+	pWrapperTable->m_BuildJobData_GetTimeStamp = (PLibMCDataBuildJobData_GetTimeStampPtr) dlsym(hLibrary, "libmcdata_buildjobdata_gettimestamp");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJobData_GetTimeStamp == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJobData_GetStorageStream = (PLibMCDataBuildJobData_GetStorageStreamPtr) GetProcAddress(hLibrary, "libmcdata_buildjobdata_getstoragestream");
+	#else // _WIN32
+	pWrapperTable->m_BuildJobData_GetStorageStream = (PLibMCDataBuildJobData_GetStorageStreamPtr) dlsym(hLibrary, "libmcdata_buildjobdata_getstoragestream");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJobData_GetStorageStream == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJobData_GetDataType = (PLibMCDataBuildJobData_GetDataTypePtr) GetProcAddress(hLibrary, "libmcdata_buildjobdata_getdatatype");
+	#else // _WIN32
+	pWrapperTable->m_BuildJobData_GetDataType = (PLibMCDataBuildJobData_GetDataTypePtr) dlsym(hLibrary, "libmcdata_buildjobdata_getdatatype");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJobData_GetDataType == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJobData_GetMIMEType = (PLibMCDataBuildJobData_GetMIMETypePtr) GetProcAddress(hLibrary, "libmcdata_buildjobdata_getmimetype");
+	#else // _WIN32
+	pWrapperTable->m_BuildJobData_GetMIMEType = (PLibMCDataBuildJobData_GetMIMETypePtr) dlsym(hLibrary, "libmcdata_buildjobdata_getmimetype");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJobData_GetMIMEType == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJobDataIterator_GetCurrentJobData = (PLibMCDataBuildJobDataIterator_GetCurrentJobDataPtr) GetProcAddress(hLibrary, "libmcdata_buildjobdataiterator_getcurrentjobdata");
+	#else // _WIN32
+	pWrapperTable->m_BuildJobDataIterator_GetCurrentJobData = (PLibMCDataBuildJobDataIterator_GetCurrentJobDataPtr) dlsym(hLibrary, "libmcdata_buildjobdataiterator_getcurrentjobdata");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJobDataIterator_GetCurrentJobData == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
 	#ifdef _WIN32
 	pWrapperTable->m_BuildJob_GetUUID = (PLibMCDataBuildJob_GetUUIDPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_getuuid");
 	#else // _WIN32
@@ -343,6 +444,15 @@ LibMCDataResult LoadLibMCDataWrapperTable(sLibMCDataDynamicWrapperTable * pWrapp
 	if (pWrapperTable->m_BuildJob_GetStatus == NULL)
 		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJob_GetLayerCount = (PLibMCDataBuildJob_GetLayerCountPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_getlayercount");
+	#else // _WIN32
+	pWrapperTable->m_BuildJob_GetLayerCount = (PLibMCDataBuildJob_GetLayerCountPtr) dlsym(hLibrary, "libmcdata_buildjob_getlayercount");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJob_GetLayerCount == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
 	#ifdef _WIN32
 	pWrapperTable->m_BuildJob_GetTimeStamp = (PLibMCDataBuildJob_GetTimeStampPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_gettimestamp");
 	#else // _WIN32
@@ -361,6 +471,15 @@ LibMCDataResult LoadLibMCDataWrapperTable(sLibMCDataDynamicWrapperTable * pWrapp
 	if (pWrapperTable->m_BuildJob_GetStorageStream == NULL)
 		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJob_GetStorageStreamUUID = (PLibMCDataBuildJob_GetStorageStreamUUIDPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_getstoragestreamuuid");
+	#else // _WIN32
+	pWrapperTable->m_BuildJob_GetStorageStreamUUID = (PLibMCDataBuildJob_GetStorageStreamUUIDPtr) dlsym(hLibrary, "libmcdata_buildjob_getstoragestreamuuid");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJob_GetStorageStreamUUID == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
 	#ifdef _WIN32
 	pWrapperTable->m_BuildJob_GetBuildJobLogger = (PLibMCDataBuildJob_GetBuildJobLoggerPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_getbuildjoblogger");
 	#else // _WIN32
@@ -370,6 +489,87 @@ LibMCDataResult LoadLibMCDataWrapperTable(sLibMCDataDynamicWrapperTable * pWrapp
 	if (pWrapperTable->m_BuildJob_GetBuildJobLogger == NULL)
 		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJob_StartValidating = (PLibMCDataBuildJob_StartValidatingPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_startvalidating");
+	#else // _WIN32
+	pWrapperTable->m_BuildJob_StartValidating = (PLibMCDataBuildJob_StartValidatingPtr) dlsym(hLibrary, "libmcdata_buildjob_startvalidating");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJob_StartValidating == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJob_FinishValidating = (PLibMCDataBuildJob_FinishValidatingPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_finishvalidating");
+	#else // _WIN32
+	pWrapperTable->m_BuildJob_FinishValidating = (PLibMCDataBuildJob_FinishValidatingPtr) dlsym(hLibrary, "libmcdata_buildjob_finishvalidating");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJob_FinishValidating == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJob_ArchiveJob = (PLibMCDataBuildJob_ArchiveJobPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_archivejob");
+	#else // _WIN32
+	pWrapperTable->m_BuildJob_ArchiveJob = (PLibMCDataBuildJob_ArchiveJobPtr) dlsym(hLibrary, "libmcdata_buildjob_archivejob");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJob_ArchiveJob == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJob_UnArchiveJob = (PLibMCDataBuildJob_UnArchiveJobPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_unarchivejob");
+	#else // _WIN32
+	pWrapperTable->m_BuildJob_UnArchiveJob = (PLibMCDataBuildJob_UnArchiveJobPtr) dlsym(hLibrary, "libmcdata_buildjob_unarchivejob");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJob_UnArchiveJob == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJob_DeleteJob = (PLibMCDataBuildJob_DeleteJobPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_deletejob");
+	#else // _WIN32
+	pWrapperTable->m_BuildJob_DeleteJob = (PLibMCDataBuildJob_DeleteJobPtr) dlsym(hLibrary, "libmcdata_buildjob_deletejob");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJob_DeleteJob == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJob_JobCanBeArchived = (PLibMCDataBuildJob_JobCanBeArchivedPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_jobcanbearchived");
+	#else // _WIN32
+	pWrapperTable->m_BuildJob_JobCanBeArchived = (PLibMCDataBuildJob_JobCanBeArchivedPtr) dlsym(hLibrary, "libmcdata_buildjob_jobcanbearchived");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJob_JobCanBeArchived == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJob_AddJobData = (PLibMCDataBuildJob_AddJobDataPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_addjobdata");
+	#else // _WIN32
+	pWrapperTable->m_BuildJob_AddJobData = (PLibMCDataBuildJob_AddJobDataPtr) dlsym(hLibrary, "libmcdata_buildjob_addjobdata");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJob_AddJobData == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJob_ListJobDataByType = (PLibMCDataBuildJob_ListJobDataByTypePtr) GetProcAddress(hLibrary, "libmcdata_buildjob_listjobdatabytype");
+	#else // _WIN32
+	pWrapperTable->m_BuildJob_ListJobDataByType = (PLibMCDataBuildJob_ListJobDataByTypePtr) dlsym(hLibrary, "libmcdata_buildjob_listjobdatabytype");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJob_ListJobDataByType == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
+	#ifdef _WIN32
+	pWrapperTable->m_BuildJob_ListJobData = (PLibMCDataBuildJob_ListJobDataPtr) GetProcAddress(hLibrary, "libmcdata_buildjob_listjobdata");
+	#else // _WIN32
+	pWrapperTable->m_BuildJob_ListJobData = (PLibMCDataBuildJob_ListJobDataPtr) dlsym(hLibrary, "libmcdata_buildjob_listjobdata");
+	dlerror();
+	#endif // _WIN32
+	if (pWrapperTable->m_BuildJob_ListJobData == NULL)
+		return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+	
 	#ifdef _WIN32
 	pWrapperTable->m_BuildJobIterator_GetCurrentJob = (PLibMCDataBuildJobIterator_GetCurrentJobPtr) GetProcAddress(hLibrary, "libmcdata_buildjobiterator_getcurrentjob");
 	#else // _WIN32
diff --git a/Server/LibMCData/libmcdata_dynamic.h b/Server/LibMCData/libmcdata_dynamic.h
index 9b2fdf94..93037fab 100644
--- a/Server/LibMCData/libmcdata_dynamic.h
+++ b/Server/LibMCData/libmcdata_dynamic.h
@@ -127,17 +127,6 @@ typedef LibMCDataResult (*PLibMCDataLogSession_AddEntryPtr) (LibMCData_LogSessio
 */
 typedef LibMCDataResult (*PLibMCDataStorageStream_GetUUIDPtr) (LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nUUIDBufferSize, LibMCData_uint32* pUUIDNeededChars, char * pUUIDBuffer);
 
-/**
-* returns the context uuid of a storage stream. Context might be for example a project uuid that this stream is part of.
-*
-* @param[in] pStorageStream - StorageStream instance.
-* @param[in] nContextUUIDBufferSize - size of the buffer (including trailing 0)
-* @param[out] pContextUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
-* @param[out] pContextUUIDBuffer -  buffer of UUID String, may be NULL
-* @return error code or 0 (success)
-*/
-typedef LibMCDataResult (*PLibMCDataStorageStream_GetContextUUIDPtr) (LibMCData_StorageStream pStorageStream, const LibMCData_uint32 nContextUUIDBufferSize, LibMCData_uint32* pContextUUIDNeededChars, char * pContextUUIDBuffer);
-
 /**
 * returns the timestamp of a storage stream.
 *
@@ -217,6 +206,26 @@ typedef LibMCDataResult (*PLibMCDataStorageStream_GetCallbacksPtr) (LibMCData_St
  Class definition for Storage
 **************************************************************************************************************************/
 
+/**
+* checks if a stream exists and is written to disk.
+*
+* @param[in] pStorage - Storage instance.
+* @param[in] pUUID - UUID of storage stream.
+* @param[out] pIsReady - Stream is ready.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorage_StreamIsReadyPtr) (LibMCData_Storage pStorage, const char * pUUID, bool * pIsReady);
+
+/**
+* retrieves an existing stream.
+*
+* @param[in] pStorage - Storage instance.
+* @param[in] pUUID - UUID of storage stream.
+* @param[out] pStreamInstance - Stream Instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorage_RetrieveStreamPtr) (LibMCData_Storage pStorage, const char * pUUID, LibMCData_StorageStream * pStreamInstance);
+
 /**
 * stores a new stream.
 *
@@ -228,10 +237,9 @@ typedef LibMCDataResult (*PLibMCDataStorageStream_GetCallbacksPtr) (LibMCData_St
 * @param[in] nContentBufferSize - Number of elements in buffer
 * @param[in] pContentBuffer - uint8 buffer of Data of stream
 * @param[in] pUserID - Currently authenticated user
-* @param[out] pStreamInstance - Stream Instance.
 * @return error code or 0 (success)
 */
-typedef LibMCDataResult (*PLibMCDataStorage_StoreNewStreamPtr) (LibMCData_Storage pStorage, const char * pUUID, const char * pContextUUID, const char * pName, const char * pMimeType, LibMCData_uint64 nContentBufferSize, const LibMCData_uint8 * pContentBuffer, const char * pUserID, LibMCData_StorageStream * pStreamInstance);
+typedef LibMCDataResult (*PLibMCDataStorage_StoreNewStreamPtr) (LibMCData_Storage pStorage, const char * pUUID, const char * pContextUUID, const char * pName, const char * pMimeType, LibMCData_uint64 nContentBufferSize, const LibMCData_uint8 * pContentBuffer, const char * pUserID);
 
 /**
 * starts storing a stream with partial uploads.
@@ -242,9 +250,11 @@ typedef LibMCDataResult (*PLibMCDataStorage_StoreNewStreamPtr) (LibMCData_Storag
 * @param[in] pName - Name of the stream.
 * @param[in] pMimeType - Mime type of the content. MUST NOT be empty.
 * @param[in] nSize - Final size of the stream. MUST NOT be 0.
+* @param[in] pSHA2 - SHA256 of the uploaded data.
+* @param[in] pUserID - Currently authenticated user
 * @return error code or 0 (success)
 */
-typedef LibMCDataResult (*PLibMCDataStorage_BeginPartialStreamPtr) (LibMCData_Storage pStorage, const char * pUUID, const char * pContextUUID, const char * pName, const char * pMimeType, LibMCData_uint64 nSize);
+typedef LibMCDataResult (*PLibMCDataStorage_BeginPartialStreamPtr) (LibMCData_Storage pStorage, const char * pUUID, const char * pContextUUID, const char * pName, const char * pMimeType, LibMCData_uint64 nSize, const char * pSHA2, const char * pUserID);
 
 /**
 * stores data in a stream with partial uploads. Uploads should be sequential for optimal performance, but may be in arbitrary order.
@@ -263,11 +273,96 @@ typedef LibMCDataResult (*PLibMCDataStorage_StorePartialStreamPtr) (LibMCData_St
 *
 * @param[in] pStorage - Storage instance.
 * @param[in] pUUID - UUID of storage stream. MUST have been created with BeginPartialStream first.
-* @param[in] pSHA2 - SHA256 of the uploaded data.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorage_FinishPartialStreamPtr) (LibMCData_Storage pStorage, const char * pUUID);
+
+/**
+* Returns the maximum stream size that the data model allows.
+*
+* @param[in] pStorage - Storage instance.
+* @param[out] pMaxStreamSize - Maximum Stream Size in Bytes.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorage_GetMaxStreamSizePtr) (LibMCData_Storage pStorage, LibMCData_uint64 * pMaxStreamSize);
+
+/**
+* Returns if the given content type is an acceptable value.
+*
+* @param[in] pStorage - Storage instance.
+* @param[in] pContentType - Content type string (is taken case-insensitive)
+* @param[out] pAccepted - Content type is accepted.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataStorage_ContentTypeIsAcceptedPtr) (LibMCData_Storage pStorage, const char * pContentType, bool * pAccepted);
+
+/*************************************************************************************************************************
+ Class definition for BuildJobData
+**************************************************************************************************************************/
+
+/**
+* returns the name of a build job.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[in] nNameBufferSize - size of the buffer (including trailing 0)
+* @param[out] pNameNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pNameBuffer -  buffer of Name String, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobData_GetNamePtr) (LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nNameBufferSize, LibMCData_uint32* pNameNeededChars, char * pNameBuffer);
+
+/**
+* returns the timestamp when the job was created.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[in] nTimestampBufferSize - size of the buffer (including trailing 0)
+* @param[out] pTimestampNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pTimestampBuffer -  buffer of Timestamp in ISO8601 UTC format, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobData_GetTimeStampPtr) (LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nTimestampBufferSize, LibMCData_uint32* pTimestampNeededChars, char * pTimestampBuffer);
+
+/**
+* returns the storage stream of the build.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
 * @param[out] pStreamInstance - Stream Instance.
 * @return error code or 0 (success)
 */
-typedef LibMCDataResult (*PLibMCDataStorage_FinishPartialStreamPtr) (LibMCData_Storage pStorage, const char * pUUID, const char * pSHA2, LibMCData_StorageStream * pStreamInstance);
+typedef LibMCDataResult (*PLibMCDataBuildJobData_GetStorageStreamPtr) (LibMCData_BuildJobData pBuildJobData, LibMCData_StorageStream * pStreamInstance);
+
+/**
+* returns the data type of the job data.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[out] pDataType - Data type of the job data
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobData_GetDataTypePtr) (LibMCData_BuildJobData pBuildJobData, eLibMCDataBuildJobDataType * pDataType);
+
+/**
+* returns the mime type of a storage stream.
+*
+* @param[in] pBuildJobData - BuildJobData instance.
+* @param[in] nMimeTypeBufferSize - size of the buffer (including trailing 0)
+* @param[out] pMimeTypeNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pMimeTypeBuffer -  buffer of Mime Type String, may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobData_GetMIMETypePtr) (LibMCData_BuildJobData pBuildJobData, const LibMCData_uint32 nMimeTypeBufferSize, LibMCData_uint32* pMimeTypeNeededChars, char * pMimeTypeBuffer);
+
+/*************************************************************************************************************************
+ Class definition for BuildJobDataIterator
+**************************************************************************************************************************/
+
+/**
+* Returns the build job data the iterator points at.
+*
+* @param[in] pBuildJobDataIterator - BuildJobDataIterator instance.
+* @param[out] pCurrentInstance - returns the build job instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJobDataIterator_GetCurrentJobDataPtr) (LibMCData_BuildJobDataIterator pBuildJobDataIterator, LibMCData_BuildJobData * pCurrentInstance);
 
 /*************************************************************************************************************************
  Class definition for BuildJob
@@ -304,6 +399,15 @@ typedef LibMCDataResult (*PLibMCDataBuildJob_GetNamePtr) (LibMCData_BuildJob pBu
 */
 typedef LibMCDataResult (*PLibMCDataBuildJob_GetStatusPtr) (LibMCData_BuildJob pBuildJob, eLibMCDataBuildJobStatus * pStatus);
 
+/**
+* returns the layer count of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pLayerCount - Layer Count of build job
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_GetLayerCountPtr) (LibMCData_BuildJob pBuildJob, LibMCData_uint32 * pLayerCount);
+
 /**
 * returns the timestamp when the job was created.
 *
@@ -324,6 +428,17 @@ typedef LibMCDataResult (*PLibMCDataBuildJob_GetTimeStampPtr) (LibMCData_BuildJo
 */
 typedef LibMCDataResult (*PLibMCDataBuildJob_GetStorageStreamPtr) (LibMCData_BuildJob pBuildJob, LibMCData_StorageStream * pStreamInstance);
 
+/**
+* returns the storage stream uuid of the build.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] nStreamUUIDBufferSize - size of the buffer (including trailing 0)
+* @param[out] pStreamUUIDNeededChars - will be filled with the count of the written bytes, or needed buffer size.
+* @param[out] pStreamUUIDBuffer -  buffer of Stream UUID., may be NULL
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_GetStorageStreamUUIDPtr) (LibMCData_BuildJob pBuildJob, const LibMCData_uint32 nStreamUUIDBufferSize, LibMCData_uint32* pStreamUUIDNeededChars, char * pStreamUUIDBuffer);
+
 /**
 * creates a build job log session access class.
 *
@@ -333,6 +448,87 @@ typedef LibMCDataResult (*PLibMCDataBuildJob_GetStorageStreamPtr) (LibMCData_Bui
 */
 typedef LibMCDataResult (*PLibMCDataBuildJob_GetBuildJobLoggerPtr) (LibMCData_BuildJob pBuildJob, LibMCData_LogSession * pLogSession);
 
+/**
+* Starts validation of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_StartValidatingPtr) (LibMCData_BuildJob pBuildJob);
+
+/**
+* Finishes validation of a build job.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] nLayerCount - Layer count
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_FinishValidatingPtr) (LibMCData_BuildJob pBuildJob, LibMCData_uint32 nLayerCount);
+
+/**
+* Archives a Job. Job MUST not be opened in the system. Job MUST be of state validated.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_ArchiveJobPtr) (LibMCData_BuildJob pBuildJob);
+
+/**
+* Unarchives a Job. Job MUST be of state archived.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_UnArchiveJobPtr) (LibMCData_BuildJob pBuildJob);
+
+/**
+* Deletes a Job permanently including all referencing data objects. Job MUST be of state archived to succeed.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_DeleteJobPtr) (LibMCData_BuildJob pBuildJob);
+
+/**
+* Returns if a job is opened.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pCanBeArchived - returns if the job can be archived.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_JobCanBeArchivedPtr) (LibMCData_BuildJob pBuildJob, bool * pCanBeArchived);
+
+/**
+* Adds additional data to the Job. Job MUST be of state validated in order to add job data.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] pName - Name of the job
+* @param[in] pStream - Storage Stream Instance
+* @param[in] eDataType - Datatype of Job data
+* @param[in] pUserID - Currently authenticated user
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_AddJobDataPtr) (LibMCData_BuildJob pBuildJob, const char * pName, LibMCData_StorageStream pStream, eLibMCDataBuildJobDataType eDataType, const char * pUserID);
+
+/**
+* Retrieves a list of build job data objects, filtered by type.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[in] eDataType - Datatype of Job data.
+* @param[out] pIteratorInstance - Build Job Data Iterator Instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_ListJobDataByTypePtr) (LibMCData_BuildJob pBuildJob, eLibMCDataBuildJobDataType eDataType, LibMCData_BuildJobDataIterator * pIteratorInstance);
+
+/**
+* Retrieves a list of build job data objects.
+*
+* @param[in] pBuildJob - BuildJob instance.
+* @param[out] pIteratorInstance - Build Job Data Iterator Instance.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataBuildJob_ListJobDataPtr) (LibMCData_BuildJob pBuildJob, LibMCData_BuildJobDataIterator * pIteratorInstance);
+
 /*************************************************************************************************************************
  Class definition for BuildJobIterator
 **************************************************************************************************************************/
@@ -357,11 +553,11 @@ typedef LibMCDataResult (*PLibMCDataBuildJobIterator_GetCurrentJobPtr) (LibMCDat
 * @param[in] pJobUUID - UUID String for the build job. Must be unique and newly generated.
 * @param[in] pName - Name String
 * @param[in] pUserID - Currently authenticated user
-* @param[in] pStreamInstance - Storage stream to create the job from. ContextUUID of Stream MUST be the Job UUID.
+* @param[in] pStorageStreamUUID - Storage stream uuid for the job. Needs not exist yet.
 * @param[out] pJobInstance - Build Job Instance.
 * @return error code or 0 (success)
 */
-typedef LibMCDataResult (*PLibMCDataBuildJobHandler_CreateJobPtr) (LibMCData_BuildJobHandler pBuildJobHandler, const char * pJobUUID, const char * pName, const char * pUserID, LibMCData_StorageStream pStreamInstance, LibMCData_BuildJob * pJobInstance);
+typedef LibMCDataResult (*PLibMCDataBuildJobHandler_CreateJobPtr) (LibMCData_BuildJobHandler pBuildJobHandler, const char * pJobUUID, const char * pName, const char * pUserID, const char * pStorageStreamUUID, LibMCData_BuildJob * pJobInstance);
 
 /**
 * Retrieves a job with a specific UUID.
@@ -527,7 +723,6 @@ typedef struct {
 	PLibMCDataIterator_CountPtr m_Iterator_Count;
 	PLibMCDataLogSession_AddEntryPtr m_LogSession_AddEntry;
 	PLibMCDataStorageStream_GetUUIDPtr m_StorageStream_GetUUID;
-	PLibMCDataStorageStream_GetContextUUIDPtr m_StorageStream_GetContextUUID;
 	PLibMCDataStorageStream_GetTimeStampPtr m_StorageStream_GetTimeStamp;
 	PLibMCDataStorageStream_GetNamePtr m_StorageStream_GetName;
 	PLibMCDataStorageStream_GetMIMETypePtr m_StorageStream_GetMIMEType;
@@ -535,16 +730,37 @@ typedef struct {
 	PLibMCDataStorageStream_GetSizePtr m_StorageStream_GetSize;
 	PLibMCDataStorageStream_GetContentPtr m_StorageStream_GetContent;
 	PLibMCDataStorageStream_GetCallbacksPtr m_StorageStream_GetCallbacks;
+	PLibMCDataStorage_StreamIsReadyPtr m_Storage_StreamIsReady;
+	PLibMCDataStorage_RetrieveStreamPtr m_Storage_RetrieveStream;
 	PLibMCDataStorage_StoreNewStreamPtr m_Storage_StoreNewStream;
 	PLibMCDataStorage_BeginPartialStreamPtr m_Storage_BeginPartialStream;
 	PLibMCDataStorage_StorePartialStreamPtr m_Storage_StorePartialStream;
 	PLibMCDataStorage_FinishPartialStreamPtr m_Storage_FinishPartialStream;
+	PLibMCDataStorage_GetMaxStreamSizePtr m_Storage_GetMaxStreamSize;
+	PLibMCDataStorage_ContentTypeIsAcceptedPtr m_Storage_ContentTypeIsAccepted;
+	PLibMCDataBuildJobData_GetNamePtr m_BuildJobData_GetName;
+	PLibMCDataBuildJobData_GetTimeStampPtr m_BuildJobData_GetTimeStamp;
+	PLibMCDataBuildJobData_GetStorageStreamPtr m_BuildJobData_GetStorageStream;
+	PLibMCDataBuildJobData_GetDataTypePtr m_BuildJobData_GetDataType;
+	PLibMCDataBuildJobData_GetMIMETypePtr m_BuildJobData_GetMIMEType;
+	PLibMCDataBuildJobDataIterator_GetCurrentJobDataPtr m_BuildJobDataIterator_GetCurrentJobData;
 	PLibMCDataBuildJob_GetUUIDPtr m_BuildJob_GetUUID;
 	PLibMCDataBuildJob_GetNamePtr m_BuildJob_GetName;
 	PLibMCDataBuildJob_GetStatusPtr m_BuildJob_GetStatus;
+	PLibMCDataBuildJob_GetLayerCountPtr m_BuildJob_GetLayerCount;
 	PLibMCDataBuildJob_GetTimeStampPtr m_BuildJob_GetTimeStamp;
 	PLibMCDataBuildJob_GetStorageStreamPtr m_BuildJob_GetStorageStream;
+	PLibMCDataBuildJob_GetStorageStreamUUIDPtr m_BuildJob_GetStorageStreamUUID;
 	PLibMCDataBuildJob_GetBuildJobLoggerPtr m_BuildJob_GetBuildJobLogger;
+	PLibMCDataBuildJob_StartValidatingPtr m_BuildJob_StartValidating;
+	PLibMCDataBuildJob_FinishValidatingPtr m_BuildJob_FinishValidating;
+	PLibMCDataBuildJob_ArchiveJobPtr m_BuildJob_ArchiveJob;
+	PLibMCDataBuildJob_UnArchiveJobPtr m_BuildJob_UnArchiveJob;
+	PLibMCDataBuildJob_DeleteJobPtr m_BuildJob_DeleteJob;
+	PLibMCDataBuildJob_JobCanBeArchivedPtr m_BuildJob_JobCanBeArchived;
+	PLibMCDataBuildJob_AddJobDataPtr m_BuildJob_AddJobData;
+	PLibMCDataBuildJob_ListJobDataByTypePtr m_BuildJob_ListJobDataByType;
+	PLibMCDataBuildJob_ListJobDataPtr m_BuildJob_ListJobData;
 	PLibMCDataBuildJobIterator_GetCurrentJobPtr m_BuildJobIterator_GetCurrentJob;
 	PLibMCDataBuildJobHandler_CreateJobPtr m_BuildJobHandler_CreateJob;
 	PLibMCDataBuildJobHandler_RetrieveJobPtr m_BuildJobHandler_RetrieveJob;
diff --git a/Server/LibMCData/libmcdata_types.h b/Server/LibMCData/libmcdata_types.h
index 7203e833..317a5bb1 100644
--- a/Server/LibMCData/libmcdata_types.h
+++ b/Server/LibMCData/libmcdata_types.h
@@ -264,6 +264,33 @@ typedef void * LibMCData_pvoid;
 #define LIBMCDATA_ERROR_INVALIDSTORAGECALLBACKSTREAM 236
 #define LIBMCDATA_ERROR_INVALIDSTORAGEPATH 237
 #define LIBMCDATA_ERROR_STORAGESTREAMNOTFOUND 238
+#define LIBMCDATA_ERROR_DUPLICATESTORAGESTREAM 239
+#define LIBMCDATA_ERROR_INVALIDPARTIALUPLOAD 240
+#define LIBMCDATA_ERROR_PARTIALUPLOADNOTFINISHED 241
+#define LIBMCDATA_ERROR_APIREQUESTNOTHANDLED 242
+#define LIBMCDATA_ERROR_APIREQUESTALREADYHANDLED 243
+#define LIBMCDATA_ERROR_INVALIDAPIREQUESTTYPE 244
+#define LIBMCDATA_ERROR_INVALIDUPLOADSTREAM 245
+#define LIBMCDATA_ERROR_COULDNOTPARSEJSONREQUEST 246
+#define LIBMCDATA_ERROR_INVALIDCONTEXTUUID 247
+#define LIBMCDATA_ERROR_INVALIDUPLOADNAME 248
+#define LIBMCDATA_ERROR_INVALIDMIMETYPE 249
+#define LIBMCDATA_ERROR_INVALIDSTREAMSIZE 250
+#define LIBMCDATA_ERROR_INVALIDSHA256SUM 251
+#define LIBMCDATA_ERROR_INVALIDSTREAMUUID 252
+#define LIBMCDATA_ERROR_INVALIDFIELDNAME 253
+#define LIBMCDATA_ERROR_UPLOADSIZEMISMATCH 254
+#define LIBMCDATA_ERROR_CONTENTTYPENOTACCEPTED 255
+#define LIBMCDATA_ERROR_NOCURRENTUPLOAD 256
+#define LIBMCDATA_ERROR_UPLOADCHECKSUMMISMATCH 257
+#define LIBMCDATA_ERROR_INVALIDSTORAGESTREAMSTATUS 258
+#define LIBMCDATA_ERROR_CONTEXTUUIDNOTACCEPTED 259
+#define LIBMCDATA_ERROR_INVALIDBUILDUUID 260
+#define LIBMCDATA_ERROR_MISSINGTHREADCOUNT 261
+#define LIBMCDATA_ERROR_INVALIDTHREADCOUNT 262
+#define LIBMCDATA_ERROR_COULDNOTUPDATEBUILDSTATUS 263
+#define LIBMCDATA_ERROR_INVALIDITERATOR 264
+#define LIBMCDATA_ERROR_INVALIDDATATYPE 265
 
 /*************************************************************************************************************************
  Error strings for LibMCData
@@ -439,6 +466,33 @@ inline const char * LIBMCDATA_GETERRORSTRING (LibMCDataResult nErrorCode) {
     case LIBMCDATA_ERROR_INVALIDSTORAGECALLBACKSTREAM: return "Invalid storage callback stream";
     case LIBMCDATA_ERROR_INVALIDSTORAGEPATH: return "Invalid storage path";
     case LIBMCDATA_ERROR_STORAGESTREAMNOTFOUND: return "Storage Stream not found";
+    case LIBMCDATA_ERROR_DUPLICATESTORAGESTREAM: return "Duplicate Storage Stream";
+    case LIBMCDATA_ERROR_INVALIDPARTIALUPLOAD: return "Invalid Partial Upload";
+    case LIBMCDATA_ERROR_PARTIALUPLOADNOTFINISHED: return "Partial Upload not finished";
+    case LIBMCDATA_ERROR_APIREQUESTNOTHANDLED: return "API Request not handled";
+    case LIBMCDATA_ERROR_APIREQUESTALREADYHANDLED: return "API Request already handled";
+    case LIBMCDATA_ERROR_INVALIDAPIREQUESTTYPE: return "Invalid API Request type";
+    case LIBMCDATA_ERROR_INVALIDUPLOADSTREAM: return "Invalid Upload Stream";
+    case LIBMCDATA_ERROR_COULDNOTPARSEJSONREQUEST: return "Could not parse JSON request";
+    case LIBMCDATA_ERROR_INVALIDCONTEXTUUID: return "Invalid Context UUID";
+    case LIBMCDATA_ERROR_INVALIDUPLOADNAME: return "Invalid Upload Name";
+    case LIBMCDATA_ERROR_INVALIDMIMETYPE: return "Invalid Mime Type";
+    case LIBMCDATA_ERROR_INVALIDSTREAMSIZE: return "Invalid Stream Size";
+    case LIBMCDATA_ERROR_INVALIDSHA256SUM: return "Invalid SHA256 Sum";
+    case LIBMCDATA_ERROR_INVALIDSTREAMUUID: return "Invalid Stream UUID";
+    case LIBMCDATA_ERROR_INVALIDFIELDNAME: return "Invalid field name";
+    case LIBMCDATA_ERROR_UPLOADSIZEMISMATCH: return "Upload size mismatch";
+    case LIBMCDATA_ERROR_CONTENTTYPENOTACCEPTED: return "Content type not accepted";
+    case LIBMCDATA_ERROR_NOCURRENTUPLOAD: return "No current upload";
+    case LIBMCDATA_ERROR_UPLOADCHECKSUMMISMATCH: return "Upload checksum mismatch";
+    case LIBMCDATA_ERROR_INVALIDSTORAGESTREAMSTATUS: return "Invalid storage stream status";
+    case LIBMCDATA_ERROR_CONTEXTUUIDNOTACCEPTED: return "Context uuid not accepted";
+    case LIBMCDATA_ERROR_INVALIDBUILDUUID: return "Invalid build uuid";
+    case LIBMCDATA_ERROR_MISSINGTHREADCOUNT: return "Missing thread count";
+    case LIBMCDATA_ERROR_INVALIDTHREADCOUNT: return "Invalid thread count";
+    case LIBMCDATA_ERROR_COULDNOTUPDATEBUILDSTATUS: return "Could not update build status";
+    case LIBMCDATA_ERROR_INVALIDITERATOR: return "Invalid iterator";
+    case LIBMCDATA_ERROR_INVALIDDATATYPE: return "Invalid data type";
     default: return "unknown error";
   }
 }
@@ -452,6 +506,8 @@ typedef LibMCDataHandle LibMCData_Iterator;
 typedef LibMCDataHandle LibMCData_LogSession;
 typedef LibMCDataHandle LibMCData_StorageStream;
 typedef LibMCDataHandle LibMCData_Storage;
+typedef LibMCDataHandle LibMCData_BuildJobData;
+typedef LibMCDataHandle LibMCData_BuildJobDataIterator;
 typedef LibMCDataHandle LibMCData_BuildJob;
 typedef LibMCDataHandle LibMCData_BuildJobIterator;
 typedef LibMCDataHandle LibMCData_BuildJobHandler;
@@ -480,9 +536,20 @@ typedef enum eLibMCDataBuildJobStatus {
   eBuildJobStatusCreated = 0,
   eBuildJobStatusValidating = 100,
   eBuildJobStatusValidated = 200,
-  eBuildJobStatusArchived = 300
+  eBuildJobStatusArchived = 300,
+  eBuildJobStatusDeleted = 400
 } eLibMCDataBuildJobStatus;
 
+typedef enum eLibMCDataBuildJobDataType {
+  eBuildJobDataTypeUnknown = 0,
+  eBuildJobDataTypeToolpath = 1,
+  eBuildJobDataTypePNGImage = 2,
+  eBuildJobDataTypeJPEGImage = 3,
+  eBuildJobDataTypeThumbnail = 4,
+  eBuildJobDataTypeTimeline = 5,
+  eBuildJobDataTypeCustomBinaryData = 100
+} eLibMCDataBuildJobDataType;
+
 /*************************************************************************************************************************
  Declaration of enum members for 4 byte struct alignment
 **************************************************************************************************************************/
@@ -502,6 +569,11 @@ typedef union {
   int m_code;
 } structEnumLibMCDataBuildJobStatus;
 
+typedef union {
+  eLibMCDataBuildJobDataType m_enum;
+  int m_code;
+} structEnumLibMCDataBuildJobDataType;
+
 /*************************************************************************************************************************
  Declaration of function pointers 
 **************************************************************************************************************************/
diff --git a/Server/LibMCData/libmcdatacfunc.go b/Server/LibMCData/libmcdatacfunc.go
index 16f61beb..2cb7a012 100644
--- a/Server/LibMCData/libmcdatacfunc.go
+++ b/Server/LibMCData/libmcdatacfunc.go
@@ -40,8 +40,4 @@ Interface version: 1.0.0
 
 package libmcdata
 
-/*
-#include "libmcdata_types.h"
-*/
-import "C"
 
diff --git a/Server/createDist.go b/Server/createDist.go
index 2e77cfcb..5bb12f19 100644
--- a/Server/createDist.go
+++ b/Server/createDist.go
@@ -34,9 +34,37 @@ type DistXMLRoot struct {
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-func createMCServerTemplate (outputName string, packageName string, clientName string, libraryName string, configName string, gitHash string) (error) {
+func createMCServerTemplate (outputDir string, packageName string, clientName string, libraryName string, configName string, gitHash string) (error) {
 
-	file, err := os.Create(outputName);
+	pkgfile, err := os.Create(outputDir + gitHash + "_package.xml");
+	if (err != nil) {
+		return err
+	}
+
+	defer pkgfile.Close()	
+
+	fmt.Fprintf(pkgfile, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
+	fmt.Fprintf(pkgfile, "<amcpackage xmlns=\"http://schemas.autodesk.com/amcpackage/2020/06\">\n");
+	fmt.Fprintf(pkgfile, "  <build name=\"%s\" configuration=\"%s\" coreclient=\"%s\">\n", packageName, configName, clientName);
+
+	fmt.Fprintf(pkgfile, "    <library name=\"core\" import=\"%s\" />\n", libraryName);
+	fmt.Fprintf(pkgfile, "    <library name=\"datamodel\" import=\"%s_core_libmcdata.dll\" />\n", gitHash);
+	fmt.Fprintf(pkgfile, "    <library name=\"lib3mf\" import=\"%s_core_lib3mf.dll\" />\n", gitHash);
+	fmt.Fprintf(pkgfile, "    <library name=\"plugin_main\" import=\"%s_plugin_main.dll\" />\n", gitHash);
+	fmt.Fprintf(pkgfile, "    <library name=\"plugin_pidcontrol\" import=\"%s_plugin_pidcontrol.dll\" />\n", gitHash);
+	fmt.Fprintf(pkgfile, "    <library name=\"plugin_printerconnection\" import=\"%s_plugin_printerconnection.dll\" />\n", gitHash);
+	fmt.Fprintf(pkgfile, "    <library name=\"driver_marlin\" import=\"%s_driver_marlin.dll\" />\n", gitHash);
+	fmt.Fprintf(pkgfile, "    <library name=\"driver_scanlab\" import=\"%s_driver_scanlab.dll\" />\n", gitHash);
+	fmt.Fprintf(pkgfile, "    <library name=\"driver_camera\" import=\"%s_driver_camera.dll\" />\n", gitHash);
+	fmt.Fprintf(pkgfile, "    <library name=\"driver_scanlaboie\" import=\"%s_driver_scanlaboie.dll\" />\n", gitHash);
+	fmt.Fprintf(pkgfile, "    <library name=\"driver_s7net\" import=\"%s_driver_s7net.dll\" />\n", gitHash);
+	fmt.Fprintf(pkgfile, "  </build>\n");
+	fmt.Fprintf(pkgfile, "</amcpackage>\n");
+	
+	pkgfile.Close()	
+	
+
+	file, err := os.Create(outputDir + "amc_server.xml");
 	if (err != nil) {
 		return err
 	}
@@ -47,19 +75,10 @@ func createMCServerTemplate (outputName string, packageName string, clientName s
 	fmt.Fprintf(file, "<amc xmlns=\"http://schemas.autodesk.com/amc/2020/06\">\n");
 	fmt.Fprintf(file, "  <server hostname=\"127.0.0.1\" port=\"8869\" />\n");
 	fmt.Fprintf(file, "  <data directory=\"data/\" database=\"sqlite\" sqlitedb=\"storage.db\" />\n");
-	fmt.Fprintf(file, "  <package name=\"%s\" coreclient=\"%s\" config=\"%s\">\n", packageName, clientName, configName);
-	
-	fmt.Fprintf(file, "    <library name=\"core\" import=\"%s\" />\n", libraryName);
-	fmt.Fprintf(file, "    <library name=\"datamodel\" import=\"%s_core_libmcdata.dll\" />\n", gitHash);
-	fmt.Fprintf(file, "    <library name=\"lib3mf\" import=\"%s_core_lib3mf.dll\" />\n", gitHash);
-	fmt.Fprintf(file, "    <library name=\"plugin_main\" import=\"%s_plugin_main.dll\" />\n", gitHash);
-	fmt.Fprintf(file, "    <library name=\"plugin_laser\" import=\"%s_plugin_laser.dll\" />\n", gitHash);
-	fmt.Fprintf(file, "    <library name=\"plugin_movement\" import=\"%s_plugin_movement.dll\" />\n", gitHash);
-	fmt.Fprintf(file, "    <library name=\"driver_marlin\" import=\"%s_driver_marlin.dll\" />\n", gitHash);
-	fmt.Fprintf(file, "    <library name=\"driver_scanlab\" import=\"%s_driver_scanlab.dll\" />\n", gitHash);
-	fmt.Fprintf(file, "  </package>\n");
+	fmt.Fprintf(file, "  <defaultpackage name=\"%s_package.xml\" githash=\"%s\" sha256=\"%s\" />\n", gitHash, gitHash, "");	
 	fmt.Fprintf(file, "</amc>\n");
-	
+
+
 	return nil;
 
 }
@@ -84,7 +103,6 @@ func main() {
 	ConfigName := hexSum + "_config.xml";
 	
 	DistXMLName := "dist.xml";
-	MCServerXMLPath := OutputDir + "amc_server.xml";
 	
 	packageName := "Build " + hexSum;
 	
@@ -201,9 +219,9 @@ func main() {
 		}
 	}
 	
-	fmt.Printf("creating %s\n", MCServerXMLPath);
+	fmt.Printf("creating server config in %s\n", OutputDir);
 	
-	err = createMCServerTemplate (MCServerXMLPath, packageName, ClientZIPName, LibraryName, ConfigName, hexSum);
+	err = createMCServerTemplate (OutputDir, packageName, ClientZIPName, LibraryName, ConfigName, hexSum);
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/Server/mcserver.go b/Server/mcserver.go
index 4af8b245..2c26fe6c 100644
--- a/Server/mcserver.go
+++ b/Server/mcserver.go
@@ -52,6 +52,31 @@ import (
 var GlobalContext libmc.MCContext;
 
 const XMLNS_SERVERCONFIG = "http://schemas.autodesk.com/amc/2020/06"
+const XMLNS_PACKAGECONFIG = "http://schemas.autodesk.com/amcpackage/2020/06"
+
+type ServerPackageXMLLibrary struct {
+	XMLName xml.Name `xml:"library"`	
+	Name string `xml:"name,attr"`
+	Import string `xml:"import,attr"`
+}
+
+
+type ServerPackageXMLBuild struct {
+	XMLName xml.Name `xml:"build"`	
+	Configuration string `xml:"configuration,attr"`
+	Name string `xml:"name,attr"`
+	CoreClient string `xml:"coreclient,attr"`
+	Libraries []ServerPackageXMLLibrary `xml:"library"`
+}
+
+
+type ServerPackageXMLRoot struct {
+	XMLName xml.Name `xml:"amcpackage"`	
+	NameSpace string `xml:"xmlns,attr"`
+	Build ServerPackageXMLBuild `xml:"build"`
+}
+
+
 
 type ServerConfigXMLServer struct {
 	XMLName xml.Name `xml:"server"`	
@@ -67,27 +92,20 @@ type ServerConfigXMLData struct {
 	SqLiteDB string `xml:"sqlitedb,attr"`
 }
 
-type ServerConfigXMLLibrary struct {
-	XMLName xml.Name `xml:"library"`	
+type ServerConfigXMLDefaultPackage struct {
+	XMLName xml.Name `xml:"defaultpackage"`	
 	Name string `xml:"name,attr"`
-	Import string `xml:"import,attr"`
+	GitHash string `xml:"githash,attr"`
+	XMLSHA2 string `xml:"xmlsha2,attr"`
 }
 
 
-type ServerConfigXMLPackage struct {
-	XMLName xml.Name `xml:"package"`	
-	Config string `xml:"config,attr"`
-	Name string `xml:"name,attr"`
-	CoreClient string `xml:"coreclient,attr"`
-	Libraries []ServerConfigXMLLibrary `xml:"library"`
-}
-
 type ServerConfigXMLRoot struct {
 	XMLName xml.Name `xml:"amc"`	
 	NameSpace string `xml:"xmlns,attr"`
 	Server ServerConfigXMLServer `xml:"server"`
 	Data ServerConfigXMLData `xml:"data"`
-	Packages []ServerConfigXMLPackage `xml:"package"`
+	DefaultPackage ServerConfigXMLDefaultPackage `xml:"defaultpackage"`
 }
 
 
@@ -115,6 +133,45 @@ func makeHandler(fn func(http.ResponseWriter, *http.Request)) http.HandlerFunc {
 	}
 }
 
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+// Server package configuration
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+func loadServerPackageXML (FileName string, SHA2 string) (ServerPackageXMLBuild, error) {
+
+	var root ServerPackageXMLRoot;
+	var build ServerPackageXMLBuild;
+	
+	file, err := os.Open(FileName);
+	if (err != nil) {
+		return build, err
+	}
+	
+	defer file.Close();
+
+	bytes, err := ioutil.ReadAll (file);
+	if (err != nil) {
+		return build, err
+	}
+	
+	err = xml.Unmarshal(bytes, &root)
+	if (err != nil) {
+		return build, err
+	}	
+	
+	if (root.NameSpace != XMLNS_PACKAGECONFIG) {
+		err = errors.New ("Invalid server package xml!");
+		return build, err;
+	}
+	
+	build = root.Build;
+	
+	return build, nil;
+
+}
+
+
+
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 // Server configuration
 //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -190,19 +247,22 @@ func LoadServerConfigXML (FileName string) (ServerConfig, error) {
 	}
 
 
-	if (len (root.Packages) == 0) {
-		err = errors.New ("Invalid package information");
+	if (len (root.DefaultPackage.Name) == 0) {
+		err = errors.New ("Invalid default package information");
 		return config, err;
 	}
 	
-	packageToUse := root.Packages[0];
+	packageToUse, err := loadServerPackageXML (root.DefaultPackage.Name, root.DefaultPackage.XMLSHA2);
+	if (err != nil) {
+		return config, err
+	}	
 
 	if (packageToUse.Name == "") {
 		err = errors.New ("Invalid package name");
 		return config, err;
 	}
 
-	if (packageToUse.Config == "") {
+	if (packageToUse.Configuration == "") {
 		err = errors.New ("Invalid package config");
 		return config, err;
 	}
@@ -217,7 +277,7 @@ func LoadServerConfigXML (FileName string) (ServerConfig, error) {
 		return config, err
 	}
 
-	config.PackageConfig, err = filepath.Abs (packageToUse.Config);
+	config.PackageConfig, err = filepath.Abs (packageToUse.Configuration);
 	if (err != nil) {
 		return config, err
 	}
@@ -257,11 +317,13 @@ func LoadServerConfigXML (FileName string) (ServerConfig, error) {
 			return config, err
 		}	
 		
+		/* for development, we are in lazy mode and do not care if the dlls exist.
+				
 		_, err = os.Stat (importPath);
 		if (err != nil) {
 			err = errors.New ("library \"" + library.Name + "\" does not exist: " + importPath);
 			return config, err
-		}		
+		}		 */
 		
 		config.PackageLibraries [library.Name] = importPath;
 		
@@ -292,55 +354,119 @@ func LoadServerConfigXML (FileName string) (ServerConfig, error) {
 func RESTHandler (w http.ResponseWriter, r *http.Request) {
 
 	var err error = nil;
-	var response libmc.APIResponse;
-	var httpcode uint32
-	var contenttype string
-	var data []byte
-
-
-	w.Header().Set("Access-Control-Allow-Origin", "*");	
-	w.Header().Set("Cache-Control", "no-cache");	
-
-	if (r.Method == "GET") {	
-		response, err = GlobalContext.HandleAPIGetRequest (r.URL.Path);
-	}
+	var dataBytes []byte;
+	bodyBytes := make ([]byte, 1);
 	
-	if (r.Method == "POST") {
+	w.Header().Set("Access-Control-Allow-Origin", "*");	
+	w.Header().Set("Cache-Control", "no-cache");
 	
-		bytes, err := ioutil.ReadAll (r.Body);
-		if (err == nil) {
-			response, err = GlobalContext.HandleAPIPostRequest (r.URL.Path, bytes);
-		}			
-	}
-
-
+	fmt.Println ("field name: ", r.URL.Path);
+				
+	requestHandler, err := GlobalContext.CreateAPIRequestHandler (r.URL.Path, r.Method);
 	if (err == nil) {
+	
+		var expectsRawBody bool = false;
+		var expectsFormData bool = false;
+		var fieldCount uint32 = 0;
+	
+		expectsRawBody, err = requestHandler.ExpectsRawBody ();	
+		if ((expectsRawBody) && (err == nil)) {				
+			bodyBytes, err = ioutil.ReadAll (r.Body);		
+		}
 		
 		if (err == nil) {
-			httpcode, err = response.GetHTTPCode ();
+			fieldCount, expectsFormData, err = requestHandler.ExpectsFormData ();
 		}
+				
+		if (expectsFormData) {		
+			err = r.ParseMultipartForm (32 * 1024 * 1024);
+			
+			if (err == nil) {
+				var fieldIndex uint32;
+				for fieldIndex = 0; fieldIndex < fieldCount; fieldIndex++ {
+				
+					fieldName, isFile, isMandatory, err := requestHandler.GetFormDataDetails (fieldIndex);
+					if (err == nil) {
 		
-		if (err == nil) {
-			contenttype, err = response.GetContentType ();
+						fmt.Println ("field name: ", fieldName);
+		
+		
+						if (isFile) {
+		
+							formFile, _, err := r.FormFile(fieldName);
+							fmt.Println ("err: ", err);
+							
+							if (err == nil) {
+
+							
+								defer formFile.Close ();
+					
+								byteArray, err := ioutil.ReadAll(formFile);
+								if (err == nil) {
+									fmt.Println ("bytearray len: ", len (byteArray));
+									
+									err = requestHandler.SetFormDataField (fieldName, byteArray);							
+								}													
+								
+							} else {
+							
+								if (!isMandatory) {
+									err = nil;
+								}
+							
+							}
+						
+						} else {
+						
+						
+								formValue := r.FormValue (fieldName);
+								if (formValue != "") {																
+									fmt.Println ("formvalue: " + formValue);														
+									err = requestHandler.SetFormStringField (fieldName, formValue);							
+								}
+								
+						
+						
+						}
+					
+					}
+										
+					if (err != nil) {
+						break;
+					}
+														
+				}
+				
+			}
+			
 		}
-
+		
 		if (err == nil) {
-			data, err = response.GetData ();
-		}
+		
+			contentType, httpCode, err := requestHandler.Handle (bodyBytes);
+				
+			if (err == nil) {
+				dataBytes, err = requestHandler.GetResultData (dataBytes);
+			} else {
+				dataBytes = make ([]byte, 1);
+			}
 
 
-		if (err == nil) {
+			if (err == nil) {
 
-			if (httpcode == 200) {		
-				w.Header().Set("Content-Type", contenttype);	
-				w.Write (data);
-			} else {		
-				http.Error (w, string (data), int (httpcode));
+				if (httpCode == 200) {		
+					w.Header().Set("Content-Type", contentType);	
+					w.Write (dataBytes);
+				} else {		
+					http.Error (w, string (dataBytes), int (httpCode));
+				}
+				
 			}
-			
 		}
-	}
 	
+	}
+
+
 	
 	if (err != nil) {
 		GlobalContext.Log (fmt.Sprintf ("Fatal error on %s: %s", r.URL.Path, err.Error()), libmc.LogSubSystem_Network, libmc.LogLevel_Message);
diff --git a/Templates/AmcDevPackage.zip b/Templates/AmcDevPackage.zip
new file mode 100644
index 00000000..6812f738
Binary files /dev/null and b/Templates/AmcDevPackage.zip differ
diff --git a/Templates/CMakeLists_DeveloperPackage.txt b/Templates/CMakeLists_DeveloperPackage.txt
index c0015e9c..a137bfe1 100644
--- a/Templates/CMakeLists_DeveloperPackage.txt
+++ b/Templates/CMakeLists_DeveloperPackage.txt
@@ -30,8 +30,33 @@ cmake_minimum_required(VERSION 3.5)
 
 project("MyMachineController")
 
+file(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/githash.txt GLOBALGITHASH)
+message(STATUS "Global git hash: \"${GLOBALGITHASH}\"")
+
 add_subdirectory(Plugins)
 
+add_custom_target(configuration_xml ALL)
+
+add_custom_command(
+	TARGET configuration_xml PRE_BUILD
+	COMMAND ${CMAKE_COMMAND} -E echo "creating output directory")
+
+add_custom_command(
+	TARGET configuration_xml PRE_BUILD
+	COMMAND ${CMAKE_COMMAND} -E make_directory			
+			${CMAKE_CURRENT_BINARY_DIR}/Output)
+
+add_custom_command(
+	TARGET configuration_xml PRE_BUILD
+	COMMAND ${CMAKE_COMMAND} -E echo "copying configuration.xml...")
+
+add_custom_command(
+    TARGET configuration_xml PRE_BUILD
+	COMMAND ${CMAKE_COMMAND} -E copy
+            ${CMAKE_SOURCE_DIR}/configuration.xml
+			${CMAKE_CURRENT_BINARY_DIR}/Output/${GLOBALGITHASH}_config.xml)
+
+
 add_custom_target(copy_distribution ALL)
 
 add_custom_command(
@@ -62,27 +87,7 @@ foreach(distfile ${distfiles})
 				
 endforeach()				
 
-		
-
-add_custom_command(
-	TARGET copy_distribution PRE_BUILD
-	COMMAND ${CMAKE_COMMAND} -E echo "copying config.xml...")
-
-add_custom_command(
-	TARGET copy_distribution PRE_BUILD
-	COMMAND ${CMAKE_COMMAND} -E copy
-			${CMAKE_SOURCE_DIR}/template_config.xml
-			${CMAKE_CURRENT_BINARY_DIR}/Output/template_config.xml)
-
-add_custom_command(
-	TARGET copy_distribution PRE_BUILD
-	COMMAND ${CMAKE_COMMAND} -E echo "creating logs directory")
-
-add_custom_command(
-	TARGET copy_distribution PRE_BUILD
-	COMMAND ${CMAKE_COMMAND} -E make_directory			
-			${CMAKE_CURRENT_BINARY_DIR}/Output/logs)
-
+	
 add_custom_command(
 	TARGET copy_distribution PRE_BUILD
 	COMMAND ${CMAKE_COMMAND} -E echo "creating data directory")
diff --git a/Templates/build_devpackage_clean.bat b/Templates/build_devpackage_clean.bat
index c08e4443..e121baf3 100644
--- a/Templates/build_devpackage_clean.bat
+++ b/Templates/build_devpackage_clean.bat
@@ -1,6 +1,9 @@
 mkdir build
 cd build
 
+mkdir Output\
+mkdir Output\data
+
 copy ..\Framework\Dist\disthash.txt .\githash.txt 
 SET /p GITHASH=<githash.txt
 
@@ -8,6 +11,5 @@ call cmake ..
 call cmake --build . --config Release
 
 cd Output
-copy template_config.xml %GITHASH%_config.xml
 
 pause
\ No newline at end of file
diff --git a/Templates/job.3mf b/Templates/job.3mf
new file mode 100644
index 00000000..14ee5ef9
Binary files /dev/null and b/Templates/job.3mf differ
diff --git a/Templates/libmcconfig.xml b/Templates/libmcconfig.xml
index b39de294..0133097d 100644
--- a/Templates/libmcconfig.xml
+++ b/Templates/libmcconfig.xml
@@ -1,98 +1,200 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <machinedefinition xmlns="http://schemas.autodesk.com/amc/machinedefinitions/2020/02">
 
+  <services threadcount="32" />
+
 
   <driver name="marlin" library="driver_marlin" type="marlin-2.0" />
-  <driver name="scanlab" library="driver_scanlab" type="scanlab-rtc5" />
-  
-  <statemachine name="main" description="Main System" initstate="init" failedstate="fatalerror" library="plugin_main">
-	 	  		  
-	  <parametergroup name="jobinfo" description="Job Information">
-		<parameter name="jobname" description="Job Name" default="TestJob" type="string" />
-		<parameter name="jobuuid" description="Job UUID" default="12345" type="string" />
-		<parameter name="layercount" description="Layer Count" default="0" type="int" />
-		<parameter name="currentlayer" description="Current Layer" default="0" type="int" />
-		<parameter name="autostart" description="Automatically start job after init" default="1" type="bool" />
-		<parameter name="printinprogress" description="Print is in progress" default="0" type="bool" />
-	  </parametergroup>
-	     	  
   
-	  <state name="init" repeatdelay="100">
-			<outstate target="idle" />
-			<outstate target="startprocess" />
-	  </state>
-
-
-	  <state name="idle" repeatdelay="50">
-			<outstate target="idle" />
-			<outstate target="startprocess" />
-	  </state>
-
-	  <state name="startprocess" repeatdelay="100">	  
-			<outstate target="coatlayer" />
-	  </state>
-	  
+    <statemachine name="main" description="Main System" initstate="init" failedstate="fatalerror" library="plugin_main">
+  	 	  		  
+  	  <parametergroup name="jobinfo" description="Job Information">
+  		<parameter name="jobname" description="Job Name" default="Job Name" type="string" />
+  		<parameter name="jobuuid" description="Job UUID" default="00000000-0000-0000-0000-000000000000" type="string" />
+  		<parameter name="layercount" description="Layer Count" default="0" type="int" />
+  		<parameter name="currentlayer" description="Current Layer" default="0" type="int" />
+  		<parameter name="autostart" description="Automatically start job after init" default="0" type="bool" />
+  		<parameter name="printinprogress" description="Print is in progress" default="0" type="bool" />
+  		<parameter name="layertimeoutgracetime" description="Grace time [ms] added to calculated layer timeout" default="1000" type="int" />
+  	  </parametergroup>
+
+  	  <parametergroup name="temperaturecontrol" description="Temperature Control">
+  		<parameter name="currentextrudertemperature" description="Current Extruder Temperature" default="0.0" type="double" />
+  		<parameter name="targetextrudertemperature" description="Target Extruder Temperature" default="0.0" type="double" />
+  		<parameter name="currentbedtemperature" description="Current Extruder Temperature" default="0.0" type="double" />
+  		<parameter name="targetbedtemperature" description="Target Extruder Temperature" default="0.0" type="double" />
+  	  </parametergroup>
 
-	  <state name="coatlayer" repeatdelay="100">
-			<outstate target="drawlayer" />
-	  </state>
 	  
+  	  <signaldefinition name="signal_startjob">
+  		<parameter name="jobuuid" type="string" />
+   		<parameter name="jobname" type="string" />
+  		<result name="success" type="bool" />		
+  	  </signaldefinition>	 	  	  	     
+    
+  	  <state name="init" repeatdelay="100">
+  			<outstate target="idle" />
+  			<outstate target="startprocess" />
+  	  </state>
+  
+  
+  	  <state name="idle" repeatdelay="50">
+  			<outstate target="idle" />
+  			<outstate target="startprocess" />
+  	  </state>
+  
+  	  <state name="startprocess" repeatdelay="100">	  
+  			<outstate target="waitfortemperature" />
+  	  </state>
+  	  
+  
+  	  <state name="waitfortemperature" repeatdelay="100">
+  			<outstate target="extrudelayer" />
+  	  </state>
+  	  
+  	  <state name="extrudelayer" repeatdelay="100">
+  			<outstate target="nextlayer" />
+  	  </state>
+  	  
+  
+  	  <state name="nextlayer" repeatdelay="100">
+  			<outstate target="waitfortemperature" />
+  			<outstate target="finishprocess" />
+  	  </state>
+  
+  
+  	  <state name="finishprocess" repeatdelay="100">	  
+  			<outstate target="idle" />
+  	  </state>
+  		
+  	  <state name="fatalerror" repeatdelay="5000">	  
+  			<outstate target="init" />
+  			<outstate target="fatalerror" />
+  	  </state>
+    
+  	  
+    </statemachine>
+  
+  
+  
+    <statemachine name="printerconnection" description="Printer Connection System" initstate="init" failedstate="fatalerror" library="plugin_printerconnection">
+  	  
+  	  <signaldefinition name="signal_doextrudelayer">
+  		<parameter name="jobuuid" type="string" />
+   		<parameter name="layerindex" type="int" />
+   		<parameter name="layertimeout" type="double" />
+  		<result name="success" type="bool" />
+  	  </signaldefinition>	 
+
+	  <signaldefinition name="signal_setpidvalues">
+		<parameter name="dp" type="double" />
+		<parameter name="di" type="double" />
+		<parameter name="dd" type="double" />
+		<result name="success" type="bool" />	
+	  </signaldefinition>	  
 
-	  <state name="drawlayer" repeatdelay="200">
-			<outstate target="nextlayer" />
-	  </state>
-
-	  <state name="nextlayer" repeatdelay="100">
-			<outstate target="coatlayer" />
-			<outstate target="finishprocess" />
-	  </state>
-
-
-	  <state name="finishprocess" repeatdelay="100">	  
-			<outstate target="idle" />
-	  </state>
-		
-	  <state name="fatalerror" repeatdelay="5000">	  
-			<outstate target="init" />
-			<outstate target="fatalerror" />
-	  </state>
+  	  <signaldefinition name="signal_settemperature">
+  		<parameter name="extrudertemperature" type="double" />
+  		<parameter name="bedtemperature" type="double" />
+  		<result name="success" type="bool" />
+  	  </signaldefinition>	 
+
+  	  <parametergroup name="comdata" description="COM Configuration">		
+  		<parameter name="port" description="COM Port" default="COM4" type="string" />
+  		<parameter name="baudrate" description="Baud rate" default="115200" type="int" />
+		<parameter name="connecttimeout" type="int" default="2000" description="Timeout [ms] for connecting printer" />
+  	  </parametergroup>
   
-	  
-  </statemachine>
+  
+  	  <parametergroup name="printerstate" description="Printer State Data">
+  		<parameter name="targetx" description="Target X Position" default="0" type="double" />
+  		<parameter name="targety" description="Target Y Position" default="0" type="double" />
+  		<parameter name="targetz" description="Target Z Position" default="0" type="double" />
+  		<parameter name="currentx" description="X Position" default="0" type="double" />
+  		<parameter name="currenty" description="Y Position" default="0" type="double" />
+  		<parameter name="currentz" description="Z Position" default="0" type="double" />
+  		<parameter name="targettemperatureextruder" description="Target Extruder Temperature" default="0" type="double" />
+  		<parameter name="currenttemperatureextruder" description="Current Extruder Temperature" default="0" type="double" />
+  		<parameter name="targettemperaturebed" description="Target Bed Temperature" default="0" type="double" />
+  		<parameter name="currenttemperaturebed" description="Current Bed Temperature" default="0" type="double" />
+  		<parameter name="ismoving" description="Moving" default="0" type="bool" />
+      		<parameter name="ishomed" description="Homed" default="0" type="bool" />
+  		<parameter name="bufferavailable" description="Buffer is available" default="0" type="bool" />
+  		<parameter name="statusupdateinterval" description="Timer interval [ms] for updating status" default="100" type="double" />
+  		<parameter name="pidvaluep" description="Printers PID, value P" default="0" type="double" />
+  		<parameter name="pidvaluei" description="Printers PID, value I" default="0" type="double" />
+  		<parameter name="pidvalued" description="Printers PID, value D" default="0" type="double" />
+  	  </parametergroup>
+  	  
+  	     	    
+  	  <state name="init" repeatdelay="100">
+  			<outstate target="idle" />
+  			<outstate target="homing" />
+  	  </state>
+  
+  
+  	  <state name="idle" repeatdelay="50">	  	 
+  			<outstate target="idle" />
+  			<outstate target="homing" />
+  			<outstate target="doextrudelayer" />
+  	  </state>
+  
+  	  <state name="homing" repeatdelay="500">	  	  
+  			<outstate target="idle" />
+  	  </state>
+  
+  	  <state name="doextrudelayer" repeatdelay="50">
+  			<outstate target="idle" />
+  	  </state>
+  
+  	  <state name="fatalerror" repeatdelay="5000">	  
+  			<outstate target="init" />
+  			<outstate target="fatalerror" />
+  	  </state>
+    
+  	  
+    </statemachine>
 
 
 
-  <statemachine name="laser" description="Laser System" initstate="init" failedstate="fatalerror" library="plugin_laser">
+  <statemachine name="pidcontrol_extruder" description="Temperature PID Control System for Extruder" initstate="init" failedstate="fatalerror" library="plugin_pidcontrol">
 
-	  <signaldefinition name="signal_drawlayer">
-		<parameter name="jobuuid" type="string" />
- 		<parameter name="layerindex" type="int" />
+	  <parametergroup name="status" description="Status of PID Control">
+		<parameter name="isactive" description="PID Control is active" default="0" type="bool" />
+		<parameter name="dp" description="dP Value" default="0" type="double" />
+		<parameter name="di" description="dI Value" default="0" type="double" />
+		<parameter name="dd" description="dD Value" default="0" type="double" />
+	  </parametergroup>
+
+	  
+	  <signaldefinition name="signal_startcontrolling">
 		<result name="success" type="bool" />		
 	  </signaldefinition>
-	  	  	  
-			  
-	  <parametergroup name="laserstate" description="Laser State">
-		<parameter name="laseron" description="Laser On" default="0" type="bool" />
-	  </parametergroup>
-	     	  
-  
+	  
+	  
+	  <signaldefinition name="signal_stopcontrolling">
+		<result name="success" type="bool" />		
+	  </signaldefinition>	  	     	    
+	  
+				
 	  <state name="init" repeatdelay="100">
 			<outstate target="idle" />
 	  </state>
 
 
-	  <state name="idle" repeatdelay="50">	  	  
+	  <state name="idle" repeatdelay="50">	  	 
 			<outstate target="idle" />
-			<outstate target="drawlayer" />
+			<outstate target="controlling" />
 	  </state>
 
-	  <state name="drawlayer" repeatdelay="50">
+	  <state name="controlling" repeatdelay="50">	  	 
 			<outstate target="idle" />
-			<outstate target="drawlayer" />
-	  </state>
+			<outstate target="controlling" />
+	  </state>	  
 
 	  <state name="fatalerror" repeatdelay="5000">	  
 			<outstate target="init" />
+			<outstate target="idle" />
 			<outstate target="fatalerror" />
 	  </state>
   
@@ -100,64 +202,36 @@
   </statemachine>
 
 
-  <statemachine name="movement" description="Movement System" initstate="init" failedstate="fatalerror" library="plugin_movement">
-	  
-	  <signaldefinition name="signal_recoatlayer">
-		<parameter name="jobuuid" type="string" />
- 		<parameter name="layerindex" type="int" />
-		<result name="success" type="bool" />		
-	  </signaldefinition>	  
-	  
-	  <parametergroup name="comdata" description="COM Configuration">		
-		<parameter name="port" description="COM Port" default="COM3" type="string" />
-		<parameter name="baudrate" description="Baud rate" default="250000" type="int" />
-	  </parametergroup>
+<userinterface appname="Autodesk Machine Control" copyright="2020 Autodesk Inc." mainpage="workflow.main" >
 
+	<page id="main" module="dialog">
 
-	  <parametergroup name="movementstate" description="Movement positions">
-		<parameter name="currentx" description="X Position" default="0" type="double" />
-		<parameter name="currenty" description="Y Position" default="0" type="double" />
-		<parameter name="currentz" description="Z Position" default="0" type="double" />
-		<parameter name="targetx" description="Target X Position" default="0" type="double" />
-		<parameter name="targety" description="Target Y Position" default="0" type="double" />
-		<parameter name="targetz" description="Target Z Position" default="0" type="double" />
-		<parameter name="currenttemperature" description="Current Temperature" default="0" type="double" />
-		<parameter name="targettemperature" description="Target Temperature" default="0" type="double" />
-		<parameter name="ismoving" description="Moving" default="0" type="bool" />
-		<parameter name="bufferavailable" description="Buffer is available" default="0" type="bool" />
-	  </parametergroup>
-	  
-	     	    
-	  <state name="init" repeatdelay="100">
-			<outstate target="idle" />
-	  </state>
 
+	</page>
 
-	  <state name="idle" repeatdelay="50">	  	 
-			<outstate target="idle" />
-			<outstate target="moveleft" />
-			<outstate target="moveright" />
-	  </state>
+	<page id="buildlist" module="buildselector">
 
-	  <state name="moveleft" repeatdelay="50">
-			<outstate target="idle" />
-			<outstate target="moveright" />
-	  </state>
+	</page>
 
-	  <state name="moveright" repeatdelay="50">
-			<outstate target="idle" />
-			<outstate target="moveleft" />
-	  </state>
-		
-	  <state name="fatalerror" repeatdelay="5000">	  
-			<outstate target="init" />
-			<outstate target="fatalerror" />
-	  </state>
-  
-	  
-  </statemachine>
+	<page id="parameters" module="datatable">
+
+	</page>
+
+
+	<menu>
+		<item id="home" icon="mdi-apps" caption="Home" targetpage="main"/>
+		<item id="build" icon="mdi-factory" caption="Builds" targetpage="buildlist"/>
+
+	</menu>
+
+	<toolbar>
+		<item id="home" icon="mdi-apps" caption="Home" targetpage="main"/>
+		<item id="build" icon="mdi-factory" caption="Builds" targetpage="buildlist"/>
+
+	</toolbar>
 
 
+  </userinterface>
 
 </machinedefinition>
 
diff --git a/Templates/test.3mf b/Templates/test.3mf
new file mode 100644
index 00000000..653074b7
Binary files /dev/null and b/Templates/test.3mf differ
diff --git a/build_clean.bat b/build_clean.bat
index f5f38f1f..d63ad5bd 100644
--- a/build_clean.bat
+++ b/build_clean.bat
@@ -1,47 +1,48 @@
-@echo off
+REM echo off
 
 set basepath=%~dp0
+echo %basepath%
 set builddir=%basepath%\build
 set outputdir=%builddir%\Output
 
-if not exist %builddir% (mkdir %builddir%)
-if not exist %outputdir% (mkdir %outputdir%)
-if not exist %builddir%\DevPackage (mkdir %builddir%\DevPackage)
-if not exist %builddir%\DevPackage\Plugins (mkdir %builddir%\DevPackage\Plugins)
-if not exist %builddir%\DevPackage\Framework (mkdir %builddir%\DevPackage\Framework)
-if not exist %builddir%\DevPackage\Framework\HeadersDev (mkdir %builddir%\DevPackage\Framework\HeadersDev)
-if not exist %builddir%\DevPackage\Framework\HeadersDev\CppDynamic (mkdir %builddir%\DevPackage\Framework\HeadersDev\CppDynamic)
-if not exist %builddir%\DevPackage\Framework\HeadersDriver (mkdir %builddir%\DevPackage\Framework\HeadersDriver)
-if not exist %builddir%\DevPackage\Framework\HeadersDriver\CppDynamic (mkdir %builddir%\DevPackage\Framework\HeadersDriver\CppDynamic)
-if not exist %builddir%\DevPackage\Framework\InterfacesDev (mkdir %builddir%\DevPackage\Framework\InterfacesDev)
-if not exist %builddir%\DevPackage\Framework\PluginCpp (mkdir %builddir%\DevPackage\Framework\PluginCpp)
-if not exist %builddir%\DevPackage\Framework\PluginPython (mkdir %builddir%\DevPackage\Framework\PluginPython)
-if not exist %builddir%\DevPackage\Framework\Dist (mkdir %builddir%\DevPackage\Framework\Dist)
+if not exist "%builddir%" (mkdir "%builddir%")
+if not exist "%outputdir%" (mkdir "%outputdir%")
+if not exist "%builddir%\DevPackage" (mkdir "%builddir%\DevPackage")
+if not exist "%builddir%\DevPackage\Plugins" (mkdir "%builddir%\DevPackage\Plugins")
+if not exist "%builddir%\DevPackage\Framework" (mkdir "%builddir%\DevPackage\Framework")
+if not exist "%builddir%\DevPackage\Framework\HeadersDev" (mkdir "%builddir%\DevPackage\Framework\HeadersDev")
+if not exist "%builddir%\DevPackage\Framework\HeadersDev\CppDynamic" (mkdir "%builddir%\DevPackage\Framework\HeadersDev\CppDynamic")
+if not exist "%builddir%\DevPackage\Framework\HeadersDriver" (mkdir "%builddir%\DevPackage\Framework\HeadersDriver")
+if not exist "%builddir%\DevPackage\Framework\HeadersDriver\CppDynamic" (mkdir "%builddir%\DevPackage\Framework\HeadersDriver\CppDynamic")
+if not exist "%builddir%\DevPackage\Framework\InterfacesDev" (mkdir "%builddir%\DevPackage\Framework\InterfacesDev")
+if not exist "%builddir%\DevPackage\Framework\PluginCpp" (mkdir "%builddir%\DevPackage\Framework\PluginCpp")
+if not exist "%builddir%\DevPackage\Framework\PluginPython" (mkdir "%builddir%\DevPackage\Framework\PluginPython")
+if not exist "%builddir%\DevPackage\Framework\Dist" (mkdir "%builddir%\DevPackage\Framework\Dist")
 
-git rev-parse --verify --short HEAD >%builddir%\githash.txt
-SET /p GITHASH=<%builddir%\githash.txt
+git rev-parse --verify --short HEAD >"%builddir%\githash.txt"
+SET /p GITHASH=<"%builddir%\githash.txt"
 echo git hash: %GITHASH%
 
-cd /d %basepath%
+cd /d "%basepath%"
 
 echo "Building Go Server..."
 go get github.com/gorilla/handlers
-go build -o %builddir%/Output/amc_server.exe -ldflags="-s -w" %basepath%/Server/mcserver.go
+go build -o "%builddir%/Output/amc_server.exe" -ldflags="-s -w" "%basepath%/Server/mcserver.go"
 
 echo "Building Client"
-cd %basepath%\Client
+cd "%basepath%\Client"
 call build_client_clean.bat
-cd %builddir%\Client
+cd "%builddir%\Client"
 go run ../../Server/createDist.go ../Output %GITHASH%
 
-cd %builddir%
+cd "%builddir%"
 
 echo "Building Core Modules"
 call cmake ..
 call cmake --build . --config Release
 
 echo "Building Developer Package"
-cd %builddir%\DevPackage
+cd "%builddir%\DevPackage"
 copy ..\githash.txt Framework\Dist\disthash.txt
 copy ..\Output\amc_server.exe Framework\Dist\
 copy ..\Output\amc_server.xml Framework\Dist\
@@ -49,10 +50,11 @@ copy ..\Output\%GITHASH%_core_libmc.dll Framework\Dist\
 copy ..\Output\%GITHASH%_core_lib3mf.dll Framework\Dist\
 copy ..\Output\%GITHASH%_core_libmcdata.dll Framework\Dist\
 copy ..\Output\%GITHASH%_core_client.zip Framework\Dist\
+copy ..\Output\%GITHASH%_package.xml Framework\Dist\
 copy ..\Output\%GITHASH%_driver_*.dll Framework\Dist\
 copy ..\Output\lib3mf.dll Framework\Dist\%GITHASH%_core_lib3mf.dll
 copy ..\..\Templates\CMakeLists_DeveloperPackage.txt CMakeLists.txt
-copy ..\..\Templates\libmcconfig.xml .\template_config.xml
+copy ..\..\Templates\libmcconfig.xml .\configuration.xml
 copy ..\..\Templates\build_devpackage_clean.bat .\build_devpackage_clean.bat
 copy ..\..\Framework\HeadersDev\CppDynamic\*.* Framework\HeadersDev\CppDynamic
 copy ..\..\Framework\InterfacesDev\*.* Framework\InterfacesDev
diff --git a/build_clean.sh b/build_clean.sh
new file mode 100755
index 00000000..8aa5a405
--- /dev/null
+++ b/build_clean.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+basepath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+builddir="$basepath/build"
+outputdir="$builddir/Output"
+
+dirs_to_make[0]="$builddir"
+dirs_to_make[1]="$outputdir"
+dirs_to_make[2]="$builddir/DevPackage"
+dirs_to_make[3]="$builddir/DevPackage/Plugins"
+dirs_to_make[4]="$builddir/DevPackage/Framework"
+dirs_to_make[5]="$builddir/DevPackage/Framework/HeadersDev"
+dirs_to_make[6]="$builddir/DevPackage/Framework/HeadersDev/CppDynamic"
+dirs_to_make[7]="$builddir/DevPackage/Framework/HeadersDriver"
+dirs_to_make[8]="$builddir/DevPackage/Framework/HeadersDriver/CppDynamic"
+dirs_to_make[9]="$builddir/DevPackage/Framework/InterfacesDev"
+dirs_to_make[10]="$builddir/DevPackage/Framework/PluginCpp"
+dirs_to_make[11]="$builddir/DevPackage/Framework/PluginPython"
+dirs_to_make[12]="$builddir/DevPackage/Framework/Dist"
+
+for dir in "${dirs_to_make[@]}"
+do
+	if [ ! -d "$dir" ]; then
+		echo "Creating directory $dir..."
+		mkdir "$dir"
+	else
+		echo "Directory $dir already exists"
+	fi
+done
+
+git rev-parse --verify --short HEAD > "$builddir/githash.txt"
+GITHASH=$(<"$builddir/githash.txt")
+echo "git hash: $GITHASH"
+
+cd "$basepath"
+
+echo "Building Go Server..."
+go get "github.com/gorilla/handlers"
+go build -o "$builddir/Output/amc_server" -ldflags="-s -w" "$basepath/Server/mcserver.go"
+
+
+#echo "Building Client"
+#cd "$basepath/Client"
+# TODO: Need to implement script to build client
+# Having issues with node packages
+
+cd "$builddir"
+
+echo "Building Core Modules"
+cmake ..
+cmake --build . --config Release
+
+#echo "Building Developer Package"
+# TODO: Copy files to builddir
+
diff --git a/githash.txt b/githash.txt
new file mode 100644
index 00000000..38cd0f8d
--- /dev/null
+++ b/githash.txt
@@ -0,0 +1 @@
+924f8fa
diff --git a/rpi_install_deps.sh b/rpi_install_deps.sh
new file mode 100755
index 00000000..829bd342
--- /dev/null
+++ b/rpi_install_deps.sh
@@ -0,0 +1,18 @@
+#sudo apt-get update
+echo 'Installing build-essential...'
+sudo apt install -y build-essential
+echo 'Installing cmake...'
+sudo apt install -y cmake
+echo 'Installing nodejs...'
+sudo apt install -y nodejs
+echo 'Installing npm...'
+sudo apt install -y npm
+echo 'Installing git...'
+sudo apt install -y git
+echo 'Installing Go...'
+GO_VERSION=1.14.7
+wget -P "$HOME/Downloads" "https://golang.org/dl/go$GO_VERSION.linux-armv6l.tar.gz"
+sudo tar -C /usr/local -xzf "$HOME/Downloads/go$GO_VERSION.linux-armv6l.tar.gz"
+export PATH=$PATH:/go/bin:/usr/local/go/bin
+echo 'export PATH=$PATH:/go/bin:/usr/local/go/bin' >>~/.bash_profile
+source ~/.bash_profile