diff --git a/v12/src/TemperatureConverter/TemperatureConverter.bar b/v12/src/TemperatureConverter/TemperatureConverter.bar
index 101ec73..439d3bd 100644
Binary files a/v12/src/TemperatureConverter/TemperatureConverter.bar and b/v12/src/TemperatureConverter/TemperatureConverter.bar differ
diff --git a/v12/src/TemperatureConverter/gen/CtoF_Request_Response.subflow b/v12/src/TemperatureConverter/gen/CtoF_Request_Response.subflow
index d23ec72..d2fce65 100644
--- a/v12/src/TemperatureConverter/gen/CtoF_Request_Response.subflow
+++ b/v12/src/TemperatureConverter/gen/CtoF_Request_Response.subflow
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ComIbmMSLMapping.msgnode="ComIbmMSLMapping.msgnode" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eflow="http://www.ibm.com/wbi/2005/eflow" xmlns:utility="http://www.ibm.com/wbi/2005/eflow_utility" nsURI="gen/CtoF_Request_Response.subflow"
-    nsPrefix="gen_CtoF_Request_Response.subflow">
-  <eClassifiers xmi:type="eflow:FCMComposite" name="FCMComposite_1" useDefaults="true" udpSupport="true">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ComIbmMSLMapping.msgnode="ComIbmMSLMapping.msgnode" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eflow="http://www.ibm.com/wbi/2005/eflow" xmlns:utility="http://www.ibm.com/wbi/2005/eflow_utility" nsURI="gen/CtoF_Request_Response.subflow" nsPrefix="gen_CtoF_Request_Response.subflow">
+  <eClassifiers xmi:type="eflow:FCMComposite" name="FCMComposite_1" useDefaults="true" udpSupport="true" nodeLayoutStyle="RECTANGLE">
     <eSuperTypes href="http://www.ibm.com/wbi/2005/eflow#//FCMBlock"/>
     <translation xmi:type="utility:TranslatableString" key="CtoF_Request_Response" bundleName="gen/CtoF_Request_Response" pluginId="TemperatureConverter"/>
     <colorGraphic16 xmi:type="utility:GIFFileGraphic" resourceName="platform:/plugin/TemperatureConverter/icons/full/obj16/CtoF_Request_Response.gif"/>
     <colorGraphic32 xmi:type="utility:GIFFileGraphic" resourceName="platform:/plugin/TemperatureConverter/icons/full/obj30/CtoF_Request_Response.gif"/>
     <composition>
-      <nodes xmi:type="eflow:FCMSource" xmi:id="InTerminal.Input" location="30,50">
+      <nodes xmi:type="eflow:FCMSource" xmi:id="InTerminal.Input" location="10,20">
         <translation xmi:type="utility:TranslatableString" key="InTerminal.Input%20Celsius" bundleName="gen/CtoF_Request_Response" pluginId="TemperatureConverter"/>
       </nodes>
-      <nodes xmi:type="eflow:FCMSink" xmi:id="OutTerminal.Output" location="330,50">
+      <nodes xmi:type="eflow:FCMSink" xmi:id="OutTerminal.Output" location="433,23">
         <translation xmi:type="utility:TranslatableString" key="OutTerminal.Output%20Fahrenheit" bundleName="gen/CtoF_Request_Response" pluginId="TemperatureConverter"/>
       </nodes>
-      <nodes xmi:type="ComIbmMSLMapping.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_1" location="170,50" mappingExpression="msl://{gen}#CtoF_Request_Response_Mapping_C_to_F">
+      <nodes xmi:type="ComIbmMSLMapping.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_1" location="209,20" mappingExpression="msl://{gen}#CtoF_Request_Response_Mapping_C_to_F">
         <translation xmi:type="utility:ConstantString" string="Mapping C to F"/>
       </nodes>
       <connections xmi:type="eflow:FCMConnection" xmi:id="FCMConnection_1" targetNode="FCMComposite_1_1" sourceNode="InTerminal.Input" sourceTerminalName="OutTerminal.out" targetTerminalName="InTerminal.in"/>
diff --git a/v12/src/TemperatureConverter/gen/FtoC_Request_Response.subflow b/v12/src/TemperatureConverter/gen/FtoC_Request_Response.subflow
index 7b384d1..41d1e7a 100644
--- a/v12/src/TemperatureConverter/gen/FtoC_Request_Response.subflow
+++ b/v12/src/TemperatureConverter/gen/FtoC_Request_Response.subflow
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ComIbmMSLMapping.msgnode="ComIbmMSLMapping.msgnode" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eflow="http://www.ibm.com/wbi/2005/eflow" xmlns:utility="http://www.ibm.com/wbi/2005/eflow_utility" nsURI="gen/FtoC_Request_Response.subflow"
-    nsPrefix="gen_FtoC_Request_Response.subflow">
-  <eClassifiers xmi:type="eflow:FCMComposite" name="FCMComposite_1" useDefaults="true" udpSupport="true">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ComIbmMSLMapping.msgnode="ComIbmMSLMapping.msgnode" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eflow="http://www.ibm.com/wbi/2005/eflow" xmlns:utility="http://www.ibm.com/wbi/2005/eflow_utility" nsURI="gen/FtoC_Request_Response.subflow" nsPrefix="gen_FtoC_Request_Response.subflow">
+  <eClassifiers xmi:type="eflow:FCMComposite" name="FCMComposite_1" useDefaults="true" udpSupport="true" nodeLayoutStyle="RECTANGLE">
     <eSuperTypes href="http://www.ibm.com/wbi/2005/eflow#//FCMBlock"/>
     <translation xmi:type="utility:TranslatableString" key="FtoC_Request_Response" bundleName="gen/FtoC_Request_Response" pluginId="TemperatureConverter"/>
     <colorGraphic16 xmi:type="utility:GIFFileGraphic" resourceName="platform:/plugin/TemperatureConverter/icons/full/obj16/FtoC_Request_Response.gif"/>
     <colorGraphic32 xmi:type="utility:GIFFileGraphic" resourceName="platform:/plugin/TemperatureConverter/icons/full/obj30/FtoC_Request_Response.gif"/>
     <composition>
-      <nodes xmi:type="eflow:FCMSource" xmi:id="InTerminal.Input" location="20,35">
+      <nodes xmi:type="eflow:FCMSource" xmi:id="InTerminal.Input" location="10,20">
         <translation xmi:type="utility:TranslatableString" key="InTerminal.Input%20Fahrenheit" bundleName="gen/FtoC_Request_Response" pluginId="TemperatureConverter"/>
       </nodes>
-      <nodes xmi:type="eflow:FCMSink" xmi:id="OutTerminal.Output" location="323,36">
+      <nodes xmi:type="eflow:FCMSink" xmi:id="OutTerminal.Output" location="431,24">
         <translation xmi:type="utility:TranslatableString" key="OutTerminal.Output Celsius" bundleName="gen/FtoC_Request_Response" pluginId="TemperatureConverter"/>
       </nodes>
-      <nodes xmi:type="ComIbmMSLMapping.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_1" location="167,35" mappingExpression="msl://{gen}#FtoC_Request_Response_Mapping_F_to_C">
+      <nodes xmi:type="ComIbmMSLMapping.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_1" location="209,20" mappingExpression="msl://{gen}#FtoC_Request_Response_Mapping_F_to_C">
         <translation xmi:type="utility:ConstantString" string="Mapping F to C"/>
       </nodes>
       <connections xmi:type="eflow:FCMConnection" xmi:id="FCMConnection_1" targetNode="FCMComposite_1_1" sourceNode="InTerminal.Input" sourceTerminalName="OutTerminal.out" targetTerminalName="InTerminal.in"/>
diff --git a/v12/src/TemperatureConverter/gen/TemperatureConverter.msgflow b/v12/src/TemperatureConverter/gen/TemperatureConverter.msgflow
index 60f76c3..3fcd64f 100644
--- a/v12/src/TemperatureConverter/gen/TemperatureConverter.msgflow
+++ b/v12/src/TemperatureConverter/gen/TemperatureConverter.msgflow
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ComIbmLabel.msgnode="ComIbmLabel.msgnode" xmlns:ComIbmRouteToLabel.msgnode="ComIbmRouteToLabel.msgnode" xmlns:ComIbmSOAPInput.msgnode="ComIbmSOAPInput.msgnode" xmlns:ComIbmSOAPReply.msgnode="ComIbmSOAPReply.msgnode" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eflow="http://www.ibm.com/wbi/2005/eflow" xmlns:gen_CtoF_Request_Response.subflow="gen/CtoF_Request_Response.subflow" xmlns:gen_FtoC_Request_Response.subflow="gen/FtoC_Request_Response.subflow"
-    xmlns:gen_TemperatureConverterInputCatchHandler.subflow="gen/TemperatureConverterInputCatchHandler.subflow" xmlns:gen_TemperatureConverterInputFailureHandler.subflow="gen/TemperatureConverterInputFailureHandler.subflow" xmlns:utility="http://www.ibm.com/wbi/2005/eflow_utility" nsURI="gen/TemperatureConverter.msgflow"
-    nsPrefix="gen_TemperatureConverter.msgflow">
-  <eClassifiers xmi:type="eflow:FCMComposite" name="FCMComposite_1">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ComIbmLabel.msgnode="ComIbmLabel.msgnode" xmlns:ComIbmRouteToLabel.msgnode="ComIbmRouteToLabel.msgnode" xmlns:ComIbmSOAPInput.msgnode="ComIbmSOAPInput.msgnode" xmlns:ComIbmSOAPReply.msgnode="ComIbmSOAPReply.msgnode" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eflow="http://www.ibm.com/wbi/2005/eflow" xmlns:gen_CtoF_Request_Response.subflow="gen/CtoF_Request_Response.subflow" xmlns:gen_FtoC_Request_Response.subflow="gen/FtoC_Request_Response.subflow"
+    xmlns:gen_TemperatureConverterInputCatchHandler.subflow="gen/TemperatureConverterInputCatchHandler.subflow" xmlns:gen_TemperatureConverterInputFailureHandler.subflow="gen/TemperatureConverterInputFailureHandler.subflow" xmlns:utility="http://www.ibm.com/wbi/2005/eflow_utility" nsURI="gen/TemperatureConverter.msgflow" nsPrefix="gen_TemperatureConverter.msgflow">
+  <eClassifiers xmi:type="eflow:FCMComposite" name="FCMComposite_1" nodeLayoutStyle="RECTANGLE">
     <eSuperTypes href="http://www.ibm.com/wbi/2005/eflow#//FCMBlock"/>
     <translation xmi:type="utility:TranslatableString" key="TemperatureConverter" bundleName="gen/TemperatureConverter" pluginId="TemperatureConverter"/>
     <colorGraphic16 xmi:type="utility:GIFFileGraphic" resourceName="platform:/plugin/TemperatureConverter/icons/full/obj16/TemperatureConverter.gif"/>
     <colorGraphic32 xmi:type="utility:GIFFileGraphic" resourceName="platform:/plugin/TemperatureConverter/icons/full/obj30/TemperatureConverter.gif"/>
     <composition>
-      <nodes xmi:type="ComIbmSOAPInput.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_1" location="50,150" wsdlFileName="TemperatureConverter.wsdl" selectedPortType="TemperatureConverter" selectedBinding="TemperatureConverterHttpBinding" selectedPort="TemperatureConverterHttpPort" targetNamespace="http://TemperatureConverter" useHTTPTransport="true" urlSelector="/TemperatureConverter/TemperatureConverter" allowQueryWSDL="true" extractSOAPBody="true">
+      <nodes xmi:type="ComIbmSOAPInput.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_1" location="46,62" wsdlFileName="TemperatureConverter.wsdl" selectedPortType="TemperatureConverter" selectedBinding="TemperatureConverterHttpBinding" selectedPort="TemperatureConverterHttpPort" targetNamespace="http://TemperatureConverter" useHTTPTransport="true" urlSelector="/TemperatureConverter/TemperatureConverter" allowQueryWSDL="true" extractSOAPBody="true">
         <translation xmi:type="utility:ConstantString" string="SOAP Input"/>
       </nodes>
-      <nodes xmi:type="ComIbmRouteToLabel.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_2" location="150,250">
+      <nodes xmi:type="ComIbmRouteToLabel.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_2" location="393,107">
         <translation xmi:type="utility:ConstantString" string="Route To Label"/>
       </nodes>
       <nodes xmi:type="ComIbmSOAPReply.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_3" location="750,250">
@@ -24,16 +22,16 @@
       <nodes xmi:type="gen_TemperatureConverterInputCatchHandler.subflow:FCMComposite_1" xmi:id="FCMComposite_1_6" location="410,170">
         <translation xmi:type="utility:ConstantString" string="TemperatureConverterInputCatchHandler"/>
       </nodes>
-      <nodes xmi:type="ComIbmLabel.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_9" location="210,390" labelName="CtoF">
+      <nodes xmi:type="ComIbmLabel.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_9" location="219,237" labelName="CtoF">
         <translation xmi:type="utility:ConstantString" string="CtoF"/>
       </nodes>
-      <nodes xmi:type="gen_CtoF_Request_Response.subflow:FCMComposite_1" xmi:id="FCMComposite_1_10" location="370,390">
+      <nodes xmi:type="gen_CtoF_Request_Response.subflow:FCMComposite_1" xmi:id="FCMComposite_1_10" location="379,237">
         <translation xmi:type="utility:ConstantString" string="CtoF_Request_Response"/>
       </nodes>
-      <nodes xmi:type="ComIbmLabel.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_11" location="210,470" labelName="FtoC">
+      <nodes xmi:type="ComIbmLabel.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_11" location="219,317" labelName="FtoC">
         <translation xmi:type="utility:ConstantString" string="FtoC"/>
       </nodes>
-      <nodes xmi:type="gen_FtoC_Request_Response.subflow:FCMComposite_1" xmi:id="FCMComposite_1_12" location="370,470">
+      <nodes xmi:type="gen_FtoC_Request_Response.subflow:FCMComposite_1" xmi:id="FCMComposite_1_12" location="379,317">
         <translation xmi:type="utility:ConstantString" string="FtoC_Request_Response"/>
       </nodes>
       <connections xmi:type="eflow:FCMConnection" xmi:id="FCMConnection_1" targetNode="FCMComposite_1_2" sourceNode="FCMComposite_1_1" sourceTerminalName="OutTerminal.out" targetTerminalName="InTerminal.in"/>
diff --git a/v12/src/TemperatureConverter/gen/TemperatureConverterInputCatchHandler.subflow b/v12/src/TemperatureConverter/gen/TemperatureConverterInputCatchHandler.subflow
index 584ae28..b13aa5d 100644
--- a/v12/src/TemperatureConverter/gen/TemperatureConverterInputCatchHandler.subflow
+++ b/v12/src/TemperatureConverter/gen/TemperatureConverterInputCatchHandler.subflow
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ComIbmMSLMapping.msgnode="ComIbmMSLMapping.msgnode" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eflow="http://www.ibm.com/wbi/2005/eflow" xmlns:utility="http://www.ibm.com/wbi/2005/eflow_utility" nsURI="gen/TemperatureConverterInputCatchHandler.subflow"
-    nsPrefix="gen_TemperatureConverterInputCatchHandler.subflow">
-  <eClassifiers xmi:type="eflow:FCMComposite" name="FCMComposite_1" useDefaults="true" udpSupport="true">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ComIbmMSLMapping.msgnode="ComIbmMSLMapping.msgnode" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eflow="http://www.ibm.com/wbi/2005/eflow" xmlns:utility="http://www.ibm.com/wbi/2005/eflow_utility" nsURI="gen/TemperatureConverterInputCatchHandler.subflow" nsPrefix="gen_TemperatureConverterInputCatchHandler.subflow">
+  <eClassifiers xmi:type="eflow:FCMComposite" name="FCMComposite_1" useDefaults="true" udpSupport="true" nodeLayoutStyle="RECTANGLE">
     <eSuperTypes href="http://www.ibm.com/wbi/2005/eflow#//FCMBlock"/>
     <translation xmi:type="utility:TranslatableString" key="TemperatureConverterInputCatchHandler" bundleName="gen/TemperatureConverterInputCatchHandler" pluginId="TemperatureConverter"/>
     <colorGraphic16 xmi:type="utility:GIFFileGraphic" resourceName="platform:/plugin/TemperatureConverter/icons/full/obj16/TemperatureConverterInputCatchHandler.gif"/>
     <colorGraphic32 xmi:type="utility:GIFFileGraphic" resourceName="platform:/plugin/TemperatureConverter/icons/full/obj30/TemperatureConverterInputCatchHandler.gif"/>
     <composition>
-      <nodes xmi:type="eflow:FCMSource" xmi:id="InTerminal.Input" location="20,20">
+      <nodes xmi:type="eflow:FCMSource" xmi:id="InTerminal.Input" location="10,20">
         <translation xmi:type="utility:TranslatableString" key="InTerminal.Input" bundleName="gen/TemperatureConverterInputCatchHandler" pluginId="TemperatureConverter"/>
       </nodes>
-      <nodes xmi:type="eflow:FCMSink" xmi:id="OutTerminal.Output" location="320,20">
+      <nodes xmi:type="eflow:FCMSink" xmi:id="OutTerminal.Output" location="430,23">
         <translation xmi:type="utility:TranslatableString" key="OutTerminal.Output" bundleName="gen/TemperatureConverterInputCatchHandler" pluginId="TemperatureConverter"/>
       </nodes>
-      <nodes xmi:type="ComIbmMSLMapping.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_3" location="162,27" mappingExpression="msl://{gen}#TemperatureConverterInputCatchHandler_Mapping">
+      <nodes xmi:type="ComIbmMSLMapping.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_3" location="209,20" mappingExpression="msl://{gen}#TemperatureConverterInputCatchHandler_Mapping">
         <translation xmi:type="utility:ConstantString" string="Mapping"/>
       </nodes>
       <connections xmi:type="eflow:FCMConnection" xmi:id="FCMConnection_1" targetNode="FCMComposite_1_3" sourceNode="InTerminal.Input" sourceTerminalName="OutTerminal.out" targetTerminalName="InTerminal.in"/>
diff --git a/v12/src/TemperatureConverter/gen/TemperatureConverterInputFailureHandler.subflow b/v12/src/TemperatureConverter/gen/TemperatureConverterInputFailureHandler.subflow
index 308618f..44eac5c 100644
--- a/v12/src/TemperatureConverter/gen/TemperatureConverterInputFailureHandler.subflow
+++ b/v12/src/TemperatureConverter/gen/TemperatureConverterInputFailureHandler.subflow
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ComIbmMSLMapping.msgnode="ComIbmMSLMapping.msgnode" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eflow="http://www.ibm.com/wbi/2005/eflow" xmlns:utility="http://www.ibm.com/wbi/2005/eflow_utility" nsURI="gen/TemperatureConverterInputFailureHandler.subflow"
-    nsPrefix="gen_TemperatureConverterInputFailureHandler.subflow">
-  <eClassifiers xmi:type="eflow:FCMComposite" name="FCMComposite_1" useDefaults="true" udpSupport="true">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ComIbmMSLMapping.msgnode="ComIbmMSLMapping.msgnode" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eflow="http://www.ibm.com/wbi/2005/eflow" xmlns:utility="http://www.ibm.com/wbi/2005/eflow_utility" nsURI="gen/TemperatureConverterInputFailureHandler.subflow" nsPrefix="gen_TemperatureConverterInputFailureHandler.subflow">
+  <eClassifiers xmi:type="eflow:FCMComposite" name="FCMComposite_1" useDefaults="true" udpSupport="true" nodeLayoutStyle="RECTANGLE">
     <eSuperTypes href="http://www.ibm.com/wbi/2005/eflow#//FCMBlock"/>
     <translation xmi:type="utility:TranslatableString" key="TemperatureConverterInputFailureHandler" bundleName="gen/TemperatureConverterInputFailureHandler" pluginId="TemperatureConverter"/>
     <colorGraphic16 xmi:type="utility:GIFFileGraphic" resourceName="platform:/plugin/TemperatureConverter/icons/full/obj16/TemperatureConverterInputFailureHandler.gif"/>
     <colorGraphic32 xmi:type="utility:GIFFileGraphic" resourceName="platform:/plugin/TemperatureConverter/icons/full/obj30/TemperatureConverterInputFailureHandler.gif"/>
     <composition>
-      <nodes xmi:type="eflow:FCMSource" xmi:id="InTerminal.Input" location="20,20">
+      <nodes xmi:type="eflow:FCMSource" xmi:id="InTerminal.Input" location="10,20">
         <translation xmi:type="utility:TranslatableString" key="InTerminal.Input" bundleName="gen/TemperatureConverterInputFailureHandler" pluginId="TemperatureConverter"/>
       </nodes>
-      <nodes xmi:type="eflow:FCMSink" xmi:id="OutTerminal.Output" location="320,20">
+      <nodes xmi:type="eflow:FCMSink" xmi:id="OutTerminal.Output" location="421,24">
         <translation xmi:type="utility:TranslatableString" key="OutTerminal.Output" bundleName="gen/TemperatureConverterInputFailureHandler" pluginId="TemperatureConverter"/>
       </nodes>
-      <nodes xmi:type="ComIbmMSLMapping.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_1" location="162,26" mappingExpression="msl://{gen}#TemperatureConverterInputFailureHandler_Mapping">
+      <nodes xmi:type="ComIbmMSLMapping.msgnode:FCMComposite_1" xmi:id="FCMComposite_1_1" location="209,20" mappingExpression="msl://{gen}#TemperatureConverterInputFailureHandler_Mapping">
         <translation xmi:type="utility:ConstantString" string="Mapping"/>
       </nodes>
       <connections xmi:type="eflow:FCMConnection" xmi:id="FCMConnection_1" targetNode="FCMComposite_1_1" sourceNode="InTerminal.Input" sourceTerminalName="OutTerminal.out" targetTerminalName="InTerminal.in"/>
diff --git a/v12/src/TemperatureConverter/gen/TemperatureConverterInputHTTPTimeoutHandler.subflow b/v12/src/TemperatureConverter/gen/TemperatureConverterInputHTTPTimeoutHandler.subflow
index e6a1f79..ed7c6c4 100644
--- a/v12/src/TemperatureConverter/gen/TemperatureConverterInputHTTPTimeoutHandler.subflow
+++ b/v12/src/TemperatureConverter/gen/TemperatureConverterInputHTTPTimeoutHandler.subflow
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eflow="http://www.ibm.com/wbi/2005/eflow" xmlns:utility="http://www.ibm.com/wbi/2005/eflow_utility" nsURI="gen/TemperatureConverterInputHTTPTimeoutHandler.subflow" nsPrefix="gen_TemperatureConverterInputHTTPTimeoutHandler.subflow">
-  <eClassifiers xmi:type="eflow:FCMComposite" name="FCMComposite_1" useDefaults="true" udpSupport="true">
+  <eClassifiers xmi:type="eflow:FCMComposite" name="FCMComposite_1" useDefaults="true" udpSupport="true" nodeLayoutStyle="RECTANGLE">
     <eSuperTypes href="http://www.ibm.com/wbi/2005/eflow#//FCMBlock"/>
     <translation xmi:type="utility:TranslatableString" key="TemperatureConverterInputHTTPTimeoutHandler" bundleName="gen/TemperatureConverterInputHTTPTimeoutHandler" pluginId="TemperatureConverter"/>
     <colorGraphic16 xmi:type="utility:GIFFileGraphic" resourceName="platform:/plugin/TemperatureConverter/icons/full/obj16/TemperatureConverterInputHTTPTimeoutHandler"/>
@@ -9,7 +9,7 @@
       <nodes xmi:type="eflow:FCMSource" xmi:id="InTerminal.Input" location="20,20">
         <translation xmi:type="utility:TranslatableString" key="InTerminal.Input" bundleName="gen/TemperatureConverterInputHTTPTimeoutHandler" pluginId="TemperatureConverter"/>
       </nodes>
-      <nodes xmi:type="eflow:FCMSink" xmi:id="OutTerminal.Output" location="320,20">
+      <nodes xmi:type="eflow:FCMSink" xmi:id="OutTerminal.Output" location="303,22">
         <translation xmi:type="utility:TranslatableString" key="OutTerminal.Output" bundleName="gen/TemperatureConverterInputHTTPTimeoutHandler" pluginId="TemperatureConverter"/>
       </nodes>
     </composition>
diff --git a/v12/src/TemperatureConverter/service.descriptor b/v12/src/TemperatureConverter/service.descriptor
index 84fdc10..2ed6d6c 100644
--- a/v12/src/TemperatureConverter/service.descriptor
+++ b/v12/src/TemperatureConverter/service.descriptor
@@ -20,5 +20,9 @@
         <service:flow location="gen/TemperatureConverterInputCatchHandler.subflow" type="Catch"/>
       </service:flows>
     </service:errors>
+    <service:resourceFiles>
+      <service:resourceFile contents="PCFET0NUWVBFIGh0bWw+CjxoZWFkPgo8VElUTEU+SW50ZWdyYXRpb24gU2VydmljZTogVGVtcGVyYXR1cmVDb252ZXJ0ZXI8L1RJVExFPgo8bWV0YSBodHRwLWVxdWl2PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD1VVEYtOCIgLz4KCjxzY3JpcHQ+CnZhciBob3N0UG9ydCA9IHdpbmRvdy5sb2NhdGlvbi5wcm90b2NvbCsnLy8nK3dpbmRvdy5sb2NhdGlvbi5ob3N0bmFtZSsod2luZG93LmxvY2F0aW9uLnBvcnQgPyAnOicrd2luZG93LmxvY2F0aW9uLnBvcnQ6ICcnKSA7CnZhciBpbmRleD0gaG9zdFBvcnQubGFzdEluZGV4T2YoIi8iKTsKaWYgKCBpbmRleCA9PSAoaG9zdFBvcnQubGVuZ3RoLTEpICl7CiAgaG9zdFBvcnQgPSBob3N0UG9ydC5zdWJzdHJpbmcoMCxpbmRleCk7Cn0KCnZhciBob3N0UG9ydFdpdGhvdXRQcm90b2NvbCA9IHdpbmRvdy5sb2NhdGlvbi5ob3N0bmFtZSsod2luZG93LmxvY2F0aW9uLnBvcnQgPyAnOicrd2luZG93LmxvY2F0aW9uLnBvcnQ6ICcnKSA7CmluZGV4PSBob3N0UG9ydFdpdGhvdXRQcm90b2NvbC5sYXN0SW5kZXhPZigiLyIpOwppZiAoIGluZGV4ID09IChob3N0UG9ydFdpdGhvdXRQcm90b2NvbC5sZW5ndGgtMSkgKXsKICBob3N0UG9ydFdpdGhvdXRQcm90b2NvbCA9IGhvc3RQb3J0V2l0aG91dFByb3RvY29sLnN1YnN0cmluZygwLGluZGV4KTsKfQp2YXIgdGhlSG9zdCA9ICJob3N0bmFtZSI7IC8vZGVmYXVsdCB2YWx1ZQp2YXIgdGhlUG9ydCA9IDExMTE7IC8vZGVmYXVsdCB2YWx1ZQppbmRleCA9IGhvc3RQb3J0V2l0aG91dFByb3RvY29sLmxhc3RJbmRleE9mKCI6Iik7CmlmICggaW5kZXggIT0gLTEgKXsKICB0aGVIb3N0ID0gaG9zdFBvcnRXaXRob3V0UHJvdG9jb2wuc3Vic3RyaW5nKDAsaW5kZXgpOwogIHRoZVBvcnQgPSBob3N0UG9ydFdpdGhvdXRQcm90b2NvbC5zdWJzdHJpbmcoaW5kZXgrMSk7Cn0KZWxzZSB7CiAgdGhlSG9zdCA9IGhvc3RQb3J0V2l0aG91dFByb3RvY29sOwp9Cgo8L3NjcmlwdD4KPC9oZWFkPgo8Ym9keT4KPHRhYmxlPgoKPHRyPgo8dGQ+CjxoMT5JbnRlZ3JhdGlvbiBTZXJ2aWNlOiBUZW1wZXJhdHVyZUNvbnZlcnRlcjwvaDE+PC90ZD4KPC90cj4KCjx0cj4KPHRkPgo8cD5UaGlzIGludGVncmF0aW9uIHNlcnZpY2UgY2FuIGJlIGludm9rZWQgdXNpbmc6PC9wPjwvdGQ+CjwvdHI+Cgo8dHI+Cjx0ZD4KPHNjcmlwdD4gZG9jdW1lbnQud3JpdGUoICc8YSBocmVmPSInICsgaG9zdFBvcnQgKyAnL1RlbXBlcmF0dXJlQ29udmVydGVyL1RlbXBlcmF0dXJlQ29udmVydGVyJyArICc/cmVzb3VyY2U9JyArICdzb2FwaHR0cC5odG1sJyArICciPicgKyAnU09BUCAvIEhUVFAnICsgJzwvYT4nICk7PC9zY3JpcHQ+PC90ZD4KPC90cj4KPC90YWJsZT4KCjwvYm9keT4KPC9odG1sPg==" contentType="text/html; charset=utf-8" name=""/>
+      <service:resourceFile contents="PCFET0NUWVBFIGh0bWw+CjxoZWFkPgoKPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9VVRGLTgiIC8+CjxUSVRMRT5JbnRlZ3JhdGlvbiBTZXJ2aWNlOiBUZW1wZXJhdHVyZUNvbnZlcnRlciAtIEludm9rZSB1c2luZyBTT0FQIC8gSFRUUDwvVElUTEU+CjxzY3JpcHQ+CnZhciBob3N0UG9ydCA9IHdpbmRvdy5sb2NhdGlvbi5wcm90b2NvbCsnLy8nK3dpbmRvdy5sb2NhdGlvbi5ob3N0bmFtZSsod2luZG93LmxvY2F0aW9uLnBvcnQgPyAnOicrd2luZG93LmxvY2F0aW9uLnBvcnQ6ICcnKSA7CnZhciBpbmRleD0gaG9zdFBvcnQubGFzdEluZGV4T2YoIi8iKTsKaWYgKCBpbmRleCA9PSAoaG9zdFBvcnQubGVuZ3RoLTEpICl7CiAgaG9zdFBvcnQgPSBob3N0UG9ydC5zdWJzdHJpbmcoMCxpbmRleCk7Cn0KCnZhciBob3N0UG9ydFdpdGhvdXRQcm90b2NvbCA9IHdpbmRvdy5sb2NhdGlvbi5ob3N0bmFtZSsod2luZG93LmxvY2F0aW9uLnBvcnQgPyAnOicrd2luZG93LmxvY2F0aW9uLnBvcnQ6ICcnKSA7CmluZGV4PSBob3N0UG9ydFdpdGhvdXRQcm90b2NvbC5sYXN0SW5kZXhPZigiLyIpOwppZiAoIGluZGV4ID09IChob3N0UG9ydFdpdGhvdXRQcm90b2NvbC5sZW5ndGgtMSkgKXsKICBob3N0UG9ydFdpdGhvdXRQcm90b2NvbCA9IGhvc3RQb3J0V2l0aG91dFByb3RvY29sLnN1YnN0cmluZygwLGluZGV4KTsKfQp2YXIgdGhlSG9zdCA9ICJob3N0bmFtZSI7IC8vZGVmYXVsdCB2YWx1ZQp2YXIgdGhlUG9ydCA9IDExMTE7IC8vZGVmYXVsdCB2YWx1ZQppbmRleCA9IGhvc3RQb3J0V2l0aG91dFByb3RvY29sLmxhc3RJbmRleE9mKCI6Iik7CmlmICggaW5kZXggIT0gLTEgKXsKICB0aGVIb3N0ID0gaG9zdFBvcnRXaXRob3V0UHJvdG9jb2wuc3Vic3RyaW5nKDAsaW5kZXgpOwogIHRoZVBvcnQgPSBob3N0UG9ydFdpdGhvdXRQcm90b2NvbC5zdWJzdHJpbmcoaW5kZXgrMSk7Cn0KZWxzZSB7CiAgdGhlSG9zdCA9IGhvc3RQb3J0V2l0aG91dFByb3RvY29sOwp9Cgo8L3NjcmlwdD4KPC9oZWFkPgo8Ym9keT4KPHRhYmxlPgoKPHRyPgo8dGQ+CjxoMT5JbnRlZ3JhdGlvbiBTZXJ2aWNlOiBUZW1wZXJhdHVyZUNvbnZlcnRlcjwvaDE+PC90ZD4KPC90cj4KCjx0cj4KPHRkPgo8aDI+SW52b2tlIHVzaW5nIFNPQVAgLyBIVFRQPC9oMj48L3RkPgo8L3RyPgoKPHRyPgo8dGQ+CjxoMz5GaWxlPC9oMz4KPC90ZD4KPC90cj4KCjx0cj4KPHRkPjx0YWJsZT4KPHRyPgo8dGQ+CjxzY3JpcHQ+IGRvY3VtZW50LndyaXRlKCAnPGEgaHJlZj0iJyArIGhvc3RQb3J0ICsgJy9UZW1wZXJhdHVyZUNvbnZlcnRlci9UZW1wZXJhdHVyZUNvbnZlcnRlcicgKyAnP3dzZGwnICsgJyI+JyArIGhvc3RQb3J0ICsgJy9UZW1wZXJhdHVyZUNvbnZlcnRlci9UZW1wZXJhdHVyZUNvbnZlcnRlcicgKyAnP3dzZGwnICsgJzwvYT4nICk7PC9zY3JpcHQ+PC90ZD4KPHRkPgotIFdTREwgaW50ZXJmYWNlIGZpbGU8L3RkPgo8L3RyPgo8L3RhYmxlPgoKPC90ZD4KPC90cj4KPC90YWJsZT4KCjwvYm9keT4KPC9odG1sPg==" contentType="text/html; charset=utf-8" name="soaphttp.html"/>
+    </service:resourceFiles>
   </service:service>
 </service:services>
\ No newline at end of file