Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/AIF/Customer/Update/Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml
===================================================================
diff -u -r35503 -r35518
--- vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/AIF/Customer/Update/Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml	(.../Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml)	(revision 35503)
+++ vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestCustomer-Update/AIF/Customer/Update/Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml	(.../Customer-UpdatePart2 K1234  - VHBE - 20160501_091500.xml)	(revision 35518)
@@ -186,6 +186,16 @@
           </DirParty>
         </CustTable>
       </Customer>
+      <EntityKeyList xmlns="http://schemas.microsoft.com/dynamics/2006/02/documents/EntityKeyList">
+        <EntityKey xmlns="http://schemas.microsoft.com/dynamics/2006/02/documents/EntityKey">
+          <KeyData>
+            <KeyField>
+              <Field>AccountNum</Field>
+              <Value>01234</Value>
+            </KeyField>
+          </KeyData>
+        </EntityKey>
+      </EntityKeyList>
     </MessageParts>
   </Body>
 </Envelope>
Index: AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml
===================================================================
diff -u -r35510 -r35518
--- AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 35510)
+++ AXimpl/AifMessage/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 35518)
@@ -39,10 +39,33 @@
 	
 	do ..RemoveDefaultDimension(.MessagePartsUpdate)
 	
+	set MessagePartsUpdate.EntityKeyList = ..GetEntityKeyList(Command.SubjectId)
+	
 	quit MessagePartsUpdate
 ]]></Implementation>
 </Method>
 
+<Method name="GetEntityKeyList">
+<FormalSpec>Id:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXaif.EntityKey.EntityKeyList</ReturnType>
+<Implementation><![CDATA[
+	Set axEntityKeyList = ##class(AXaif.EntityKey.EntityKeyList).%New()
+	Set axEntityKey = ##class(AXaif.EntityKey.EntityKey).%New()
+	Set axKeyData = ##class(AXaif.EntityKey.KeyData).%New()	
+	Set axKeyField = ##class(AXaif.EntityKey.KeyField).%New()
+	
+	Set axKeyField.Field = "AccountNum"
+	Set axKeyField.Value = ##class(TECH.StringUtils).AlignRight($Extract(Id,4,*),0,5)
+	
+	Do axKeyData.KeyField.Insert(axKeyField)
+	Do axEntityKey.KeyData.Insert(axKeyData)	
+	Set axEntityKeyList.EntityKey = axEntityKey
+	
+	Quit axEntityKeyList
+]]></Implementation>
+</Method>
+
 <Method name="Merge">
 <FormalSpec>MessagePartsRead:AXaif.Message.MessageParts,MessagePartsCreate:AXaif.Message.MessageParts</FormalSpec>
 <Private>1</Private>