diff --git a/connector-amqp-import/samples/amqp-import.xml b/connector-amqp-import/samples/amqp-import.xml
index 893515f..736125d 100644
--- a/connector-amqp-import/samples/amqp-import.xml
+++ b/connector-amqp-import/samples/amqp-import.xml
@@ -1,376 +1,470 @@
-<resource xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-          xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
-          xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-          xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
-          xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3"
-          xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
-          xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
-          oid="dcf8cf6b-4986-46e8-b2e9-92ccf9f0b39e"
-          version="11">
-   <name>AmqpImport</name>
-   <metadata>
-      <modifyTimestamp>2017-09-21T14:11:57.837Z</modifyTimestamp>
-      <modifierRef xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-                   oid="00000000-0000-0000-0000-000000000002"
-                   relation="org:default"
-                   type="tns:UserType"/>
-      <modifyChannel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</modifyChannel>
-   </metadata>
-   <operationExecution id="1">
-      <timestamp>2017-09-21T14:11:32.117Z</timestamp>
-      <operation>
-         <objectDelta>
-            <t:changeType>modify</t:changeType>
-            <t:objectType>c:ResourceType</t:objectType>
-         </objectDelta>
-         <executionResult>
-            <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-            <status>success</status>
-            <token>1000000000000000107</token>
-         </executionResult>
-         <objectName>AmqpImport</objectName>
-      </operation>
-      <status>success</status>
-      <initiatorRef oid="00000000-0000-0000-0000-000000000002"
-                    relation="org:default"
-                    type="c:UserType"/>
-      <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-   </operationExecution>
-   <operationExecution id="2">
-      <timestamp>2017-09-21T14:11:51.716Z</timestamp>
-      <operation>
-         <objectDelta>
-            <t:changeType>modify</t:changeType>
-            <t:objectType>c:ResourceType</t:objectType>
-         </objectDelta>
-         <executionResult>
-            <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-            <status>success</status>
-            <token>1000000000000000156</token>
-         </executionResult>
-         <objectName>AmqpImport</objectName>
-      </operation>
-      <status>success</status>
-      <initiatorRef oid="00000000-0000-0000-0000-000000000002"
-                    relation="org:default"
-                    type="c:UserType"/>
-      <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-   </operationExecution>
-   <operationExecution id="3">
-      <timestamp>2017-09-21T14:11:54.743Z</timestamp>
-      <operation>
-         <objectDelta>
-            <t:changeType>modify</t:changeType>
-            <t:objectType>c:ResourceType</t:objectType>
-         </objectDelta>
-         <executionResult>
-            <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-            <status>success</status>
-            <token>1000000000000000185</token>
-         </executionResult>
-         <objectName>AmqpImport</objectName>
-      </operation>
-      <status>success</status>
-      <initiatorRef oid="00000000-0000-0000-0000-000000000002"
-                    relation="org:default"
-                    type="c:UserType"/>
-      <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-   </operationExecution>
-   <operationExecution id="4">
-      <timestamp>2017-09-21T14:11:57.924Z</timestamp>
-      <operation>
-         <objectDelta>
-            <t:changeType>modify</t:changeType>
-            <t:objectType>c:ResourceType</t:objectType>
-         </objectDelta>
-         <executionResult>
-            <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
-            <status>success</status>
-            <token>1000000000000000214</token>
-         </executionResult>
-         <objectName>AmqpImport</objectName>
-      </operation>
-      <status>success</status>
-      <initiatorRef oid="00000000-0000-0000-0000-000000000002"
-                    relation="org:default"
-                    type="c:UserType"/>
-      <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
-   </operationExecution>
-   <operationalState>
-      <lastAvailabilityStatus>up</lastAvailabilityStatus>
-   </operationalState>
- <connectorRef type="ConnectorType">
-                        <filter>
-                                <q:equal>
-                                        <q:path>c:connectorType</q:path>
-                                        <q:value>edu.unc.polygon.connector.amqp.AmqpConnector</q:value>
-                                </q:equal>
-                        </filter>
-                </connectorRef>
-
-   <connectorConfiguration xmlns:icfc="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-3">
-      <icfc:configurationProperties xmlns:gen654="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/edu.unc.polygon.connector-amqp-import/edu.unc.polygon.connector.amqp.AmqpConnector">
-         <gen654:amqpUniqueAttribute>id</gen654:amqpUniqueAttribute>
-         <gen654:amqpExchangename>sor</gen654:amqpExchangename>
-         <gen654:amqpRoutingkey>sor_person</gen654:amqpRoutingkey>
-         <gen654:amqpScimPayloadField>payload</gen654:amqpScimPayloadField>
-         <gen654:amqpPassword>5ecr3t</gen654:amqpPassword>
-         <gen654:amqpHost>mq</gen654:amqpHost>
-         <gen654:amqpQueuename>sor_person</gen654:amqpQueuename>
-         <gen654:amqpUsername>mysql</gen654:amqpUsername>
-         <gen654:amqpNameAttribute>id</gen654:amqpNameAttribute>
-      </icfc:configurationProperties>
-   </connectorConfiguration>
-   <schema>
-      <cachingMetadata>
-         <retrievalTimestamp>2017-09-21T14:11:32.347Z</retrievalTimestamp>
-         <serialNumber>b770289cd65cdc8b-15db7329434d7839</serialNumber>
-      </cachingMetadata>
-      <definition>
-         <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                     xmlns:a="http://prism.evolveum.com/xml/ns/public/annotation-3"
-                     xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
-                     xmlns:ra="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3"
-                     elementFormDefault="qualified"
-                     targetNamespace="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
-            <xsd:import namespace="http://prism.evolveum.com/xml/ns/public/annotation-3"/>
-            <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"/>
-            <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3"/>
-            <xsd:complexType name="MESSAGE_OBJECT_CLASS___ACCOUNT__">
-               <xsd:annotation>
-                  <xsd:appinfo>
-                     <ra:resourceObject/>
-                     <ra:identifier>icfs:name</ra:identifier>
-                     <ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
-                     <ra:namingAttribute>icfs:name</ra:namingAttribute>
-                     <ra:nativeObjectClass>MESSAGE_OBJECT_CLASS___ACCOUNT__</ra:nativeObjectClass>
-                  </xsd:appinfo>
-               </xsd:annotation>
-               <xsd:sequence>
-                  <xsd:element minOccurs="0" name="orgId" type="xsd:string">
-                     <xsd:annotation>
-                        <xsd:appinfo>
-                           <a:displayOrder>120</a:displayOrder>
-                           <ra:frameworkAttributeName>orgId</ra:frameworkAttributeName>
-                        </xsd:appinfo>
-                     </xsd:annotation>
-                  </xsd:element>
-                  <xsd:element minOccurs="0" name="active" type="xsd:string">
-                     <xsd:annotation>
-                        <xsd:appinfo>
-                           <a:displayOrder>130</a:displayOrder>
-                           <ra:frameworkAttributeName>active</ra:frameworkAttributeName>
-                        </xsd:appinfo>
-                     </xsd:annotation>
-                  </xsd:element>
-                  <xsd:element minOccurs="0" name="lastname" type="xsd:string">
-                     <xsd:annotation>
-                        <xsd:appinfo>
-                           <a:displayOrder>140</a:displayOrder>
-                           <ra:frameworkAttributeName>lastname</ra:frameworkAttributeName>
-                        </xsd:appinfo>
-                     </xsd:annotation>
-                  </xsd:element>
-                  <xsd:element minOccurs="0" name="phone" type="xsd:string">
-                     <xsd:annotation>
-                        <xsd:appinfo>
-                           <a:displayOrder>150</a:displayOrder>
-                           <ra:frameworkAttributeName>phone</ra:frameworkAttributeName>
-                        </xsd:appinfo>
-                     </xsd:annotation>
-                  </xsd:element>
-                  <xsd:element minOccurs="0" name="firstname" type="xsd:string">
-                     <xsd:annotation>
-                        <xsd:appinfo>
-                           <a:displayOrder>160</a:displayOrder>
-                           <ra:frameworkAttributeName>firstname</ra:frameworkAttributeName>
-                        </xsd:appinfo>
-                     </xsd:annotation>
-                  </xsd:element>
-                  <xsd:element ref="icfs:name">
-                     <xsd:annotation>
-                        <xsd:appinfo>
-                           <a:displayName>id</a:displayName>
-                           <a:displayOrder>110</a:displayOrder>
-                           <ra:frameworkAttributeName>__NAME__</ra:frameworkAttributeName>
-                        </xsd:appinfo>
-                     </xsd:annotation>
-                  </xsd:element>
-                  <xsd:element minOccurs="0" name="job" type="xsd:string">
-                     <xsd:annotation>
+<resource xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" oid="dcf8cf6b-4986-46e8-b2e9-92ccf9f0b39e" version="37">
+    <name>AmqpImport</name>
+    <metadata>
+        <modifyTimestamp>2019-05-10T19:14:32.966Z</modifyTimestamp>
+        <modifierRef xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="tns:UserType"/>
+        <modifyChannel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</modifyChannel>
+    </metadata>
+    <operationExecution id="1">
+        <timestamp>2017-09-21T14:11:32.117Z</timestamp>
+        <operation>
+            <objectDelta>
+                <t:changeType>modify</t:changeType>
+                <t:objectType>c:ResourceType</t:objectType>
+            </objectDelta>
+            <executionResult>
+                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
+                <status>success</status>
+                <token>1000000000000000107</token>
+            </executionResult>
+            <objectName>AmqpImport</objectName>
+        </operation>
+        <status>success</status>
+        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
+        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
+    </operationExecution>
+    <operationExecution id="2">
+        <timestamp>2017-09-21T14:11:51.716Z</timestamp>
+        <operation>
+            <objectDelta>
+                <t:changeType>modify</t:changeType>
+                <t:objectType>c:ResourceType</t:objectType>
+            </objectDelta>
+            <executionResult>
+                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
+                <status>success</status>
+                <token>1000000000000000156</token>
+            </executionResult>
+            <objectName>AmqpImport</objectName>
+        </operation>
+        <status>success</status>
+        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
+        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
+    </operationExecution>
+    <operationExecution id="3">
+        <timestamp>2017-09-21T14:11:54.743Z</timestamp>
+        <operation>
+            <objectDelta>
+                <t:changeType>modify</t:changeType>
+                <t:objectType>c:ResourceType</t:objectType>
+            </objectDelta>
+            <executionResult>
+                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
+                <status>success</status>
+                <token>1000000000000000185</token>
+            </executionResult>
+            <objectName>AmqpImport</objectName>
+        </operation>
+        <status>success</status>
+        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
+        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
+    </operationExecution>
+    <operationExecution id="4">
+        <timestamp>2017-09-21T14:11:57.924Z</timestamp>
+        <operation>
+            <objectDelta>
+                <t:changeType>modify</t:changeType>
+                <t:objectType>c:ResourceType</t:objectType>
+            </objectDelta>
+            <executionResult>
+                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
+                <status>success</status>
+                <token>1000000000000000214</token>
+            </executionResult>
+            <objectName>AmqpImport</objectName>
+        </operation>
+        <status>success</status>
+        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
+        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
+    </operationExecution>
+    <operationExecution id="23">
+        <timestamp>2019-05-10T19:14:33.060Z</timestamp>
+        <operation>
+            <objectDelta>
+                <t:changeType>modify</t:changeType>
+                <t:objectType>c:ResourceType</t:objectType>
+            </objectDelta>
+            <executionResult>
+                <operation>com.evolveum.midpoint.model.impl.lens.ChangeExecutor.executeDelta</operation>
+                <status>success</status>
+                <token>1000000000000000640</token>
+            </executionResult>
+            <objectName>AmqpImport</objectName>
+        </operation>
+        <status>success</status>
+        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>
+        <channel>http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user</channel>
+    </operationExecution>
+    <operationalState>
+        <lastAvailabilityStatus>up</lastAvailabilityStatus>
+    </operationalState>
+    <connectorRef  type="c:ConnectorType">
+        <filter>
+            <q:equal>
+                <q:path>c:connectorType</q:path>
+                <q:value>edu.unc.polygon.connector.amqp.AmqpConnector</q:value>
+            </q:equal>
+        </filter>
+    </connectorRef>
+    <connectorConfiguration xmlns:icfc="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-3">
+        <icfc:configurationProperties xmlns:gen324="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/edu.unc.polygon.connector-amqp-import/edu.unc.polygon.connector.amqp.AmqpConnector">
+            <gen324:amqpUniqueAttribute>id</gen324:amqpUniqueAttribute>
+            <gen324:amqpExchangename>sor</gen324:amqpExchangename>
+            <gen324:amqpRoutingkey>sor_person</gen324:amqpRoutingkey>
+            <gen324:amqpScimPayloadField>payload</gen324:amqpScimPayloadField>
+            <gen324:amqpPassword>5ecr3t</gen324:amqpPassword>
+            <gen324:amqpHost>mq</gen324:amqpHost>
+            <gen324:amqpQueuename>sor_person</gen324:amqpQueuename>
+            <gen324:amqpUsername>mysql</gen324:amqpUsername>
+            <gen324:amqpNameAttribute>id</gen324:amqpNameAttribute>
+        </icfc:configurationProperties>
+    </connectorConfiguration>
+    <schema>
+        <cachingMetadata>
+            <retrievalTimestamp>2019-05-10T19:14:33.138Z</retrievalTimestamp>
+            <serialNumber>cccc5a900956c4dc-dda4212a83666460</serialNumber>
+        </cachingMetadata>
+        <definition>
+            <xsd:schema xmlns:a="http://prism.evolveum.com/xml/ns/public/annotation-3" xmlns:ra="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3" xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
+                <xsd:import namespace="http://prism.evolveum.com/xml/ns/public/annotation-3"/>
+                <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"/>
+                <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3"/>
+                <xsd:complexType name="MESSAGE_OBJECT_CLASS___ACCOUNT__">
+                    <xsd:annotation>
                         <xsd:appinfo>
-                           <a:displayOrder>180</a:displayOrder>
-                           <ra:frameworkAttributeName>job</ra:frameworkAttributeName>
+                            <ra:resourceObject/>
+                            <ra:identifier>icfs:uid</ra:identifier>
+                            <ra:secondaryIdentifier>icfs:name</ra:secondaryIdentifier>
+                            <ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
+                            <ra:namingAttribute>icfs:name</ra:namingAttribute>
+                            <ra:nativeObjectClass>MESSAGE_OBJECT_CLASS___ACCOUNT__</ra:nativeObjectClass>
                         </xsd:appinfo>
-                     </xsd:annotation>
-                  </xsd:element>
-                  <xsd:element minOccurs="0" name="email" type="xsd:string">
-                     <xsd:annotation>
-                        <xsd:appinfo>
-                           <a:displayOrder>190</a:displayOrder>
-                           <ra:frameworkAttributeName>email</ra:frameworkAttributeName>
-                        </xsd:appinfo>
-                     </xsd:annotation>
-                  </xsd:element>
-                  <xsd:element minOccurs="0" name="fullname" type="xsd:string">
-                     <xsd:annotation>
-                        <xsd:appinfo>
-                           <a:displayOrder>200</a:displayOrder>
-                           <ra:frameworkAttributeName>fullname</ra:frameworkAttributeName>
-                        </xsd:appinfo>
-                     </xsd:annotation>
-                  </xsd:element>
-                  <xsd:element minOccurs="0" ref="icfs:uid">
-                     <xsd:annotation>
-                        <xsd:appinfo>
-                           <a:displayName>ConnId UID</a:displayName>
-                           <a:displayOrder>100</a:displayOrder>
-                           <a:access>read</a:access>
-                        </xsd:appinfo>
-                     </xsd:annotation>
-                  </xsd:element>
-               </xsd:sequence>
-            </xsd:complexType>
-         </xsd:schema>
-      </definition>
-   </schema>
-   <schemaHandling>
-      <objectType>
-         <kind>account</kind>
-         <intent>default</intent>
-         <default>true</default>
-         <objectClass>ri:MESSAGE_OBJECT_CLASS___ACCOUNT__</objectClass>
-         <attribute>
-            <c:ref>icfs:name</c:ref>
-            <displayName>Employee ID</displayName>
-            <inbound>
-               <target>
-                  <c:path>$user/name</c:path>
-               </target>
-            </inbound>
-         </attribute>
-         <attribute>
-            <c:ref>ri:fullname</c:ref>
-            <inbound>
-               <target>
-                  <c:path>$user/fullName</c:path>
-               </target>
-            </inbound>
-         </attribute>
-         <attribute>
-            <c:ref>ri:firstname</c:ref>
-            <inbound>
-               <target>
-                  <c:path>$user/givenName</c:path>
-               </target>
-            </inbound>
-         </attribute>
-         <attribute>
-            <c:ref>ri:lastname</c:ref>
-            <inbound>
-               <target>
-                  <c:path>$user/familyName</c:path>
-               </target>
-            </inbound>
-         </attribute>
-         <attribute>
-            <c:ref>ri:orgId</c:ref>
-            <inbound>
-               <target>
-                  <c:path>$user/organizationalUnit</c:path>
-               </target>
-            </inbound>
-         </attribute>
-         <attribute>
-            <c:ref>ri:job</c:ref>
-            <inbound>
-               <target>
-                  <c:path>$user/title</c:path>
-               </target>
-            </inbound>
-         </attribute>
-         <attribute>
-            <c:ref>ri:phone</c:ref>
-            <inbound>
-               <target>
-                  <c:path>$user/telephoneNumber</c:path>
-               </target>
-            </inbound>
-         </attribute>
-         <attribute>
-            <c:ref>ri:email</c:ref>
-            <inbound>
-               <target>
-                  <c:path>$user/emailAddress</c:path>
-               </target>
-            </inbound>
-         </attribute>
-         <activation>
-            <administrativeStatus>
-               <inbound>
-                  <strength>weak</strength>
-               </inbound>
-            </administrativeStatus>
-         </activation>
-         <credentials>
-            <password>
-               <inbound>
-                  <strength>weak</strength>
-                  <expression>
-                     <generate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                               xsi:type="c:GenerateExpressionEvaluatorType"/>
-                  </expression>
-               </inbound>
-            </password>
-         </credentials>
-      </objectType>
-   </schemaHandling>
-   <capabilities>
-      <cachingMetadata>
-         <retrievalTimestamp>2017-09-21T14:11:32.345Z</retrievalTimestamp>
-         <serialNumber>a0989f9bf0bb5d59-12605cef28272abc</serialNumber>
-      </cachingMetadata>
-      <native xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:type="c:CapabilityCollectionType">
-         <cap:schema/>
-         <cap:testConnection/>
-         <cap:read/>
-         <cap:delete/>
-         <cap:script>
-            <cap:host>
-               <cap:type>connector</cap:type>
-            </cap:host>
-         </cap:script>
-         <cap:addRemoveAttributeValues/>
-      </native>
-      <configured xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:type="c:CapabilityCollectionType">
-         <cap:testConnection>
-            <cap:enabled>true</cap:enabled>
-         </cap:testConnection>
-         <cap:read>
-            <cap:enabled>true</cap:enabled>
-         </cap:read>
-         <cap:delete>
-            <cap:enabled>true</cap:enabled>
-         </cap:delete>
-         <cap:script>
-            <cap:enabled>true</cap:enabled>
-            <cap:host>
-               <cap:type>connector</cap:type>
-            </cap:host>
-         </cap:script>
-         <cap:addRemoveAttributeValues>
-            <cap:enabled>true</cap:enabled>
-         </cap:addRemoveAttributeValues>
-      </configured>
-   </capabilities>
-   <projection>
-      <assignmentPolicyEnforcement>full</assignmentPolicyEnforcement>
-   </projection>
- <synchronization>
+                    </xsd:annotation>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="0" name="orgId" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>120</a:displayOrder>
+                                    <ra:frameworkAttributeName>orgId</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" name="active" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>130</a:displayOrder>
+                                    <ra:frameworkAttributeName>active</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" name="subjectId" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>140</a:displayOrder>
+                                    <ra:nativeAttributeName>subject-id</ra:nativeAttributeName>
+                                    <ra:frameworkAttributeName>subjectId</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element maxOccurs="unbounded" minOccurs="0" name="phone" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>150</a:displayOrder>
+                                    <ra:frameworkAttributeName>phone</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element maxOccurs="unbounded" minOccurs="0" name="sourceId" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>160</a:displayOrder>
+                                    <ra:frameworkAttributeName>sourceId</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" name="firstname" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>170</a:displayOrder>
+                                    <ra:frameworkAttributeName>firstname</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" name="birthDate" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>180</a:displayOrder>
+                                    <ra:frameworkAttributeName>birthDate</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" name="nameType" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>190</a:displayOrder>
+                                    <ra:frameworkAttributeName>nameType</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" name="email" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>200</a:displayOrder>
+                                    <ra:frameworkAttributeName>email</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" name="personalPronoun" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>210</a:displayOrder>
+                                    <ra:frameworkAttributeName>personalPronoun</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" name="middleName" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>220</a:displayOrder>
+                                    <ra:frameworkAttributeName>middleName</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" name="lastname" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>230</a:displayOrder>
+                                    <ra:frameworkAttributeName>lastname</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" name="loginId" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>240</a:displayOrder>
+                                    <ra:nativeAttributeName>login-id</ra:nativeAttributeName>
+                                    <ra:frameworkAttributeName>loginId</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element maxOccurs="unbounded" minOccurs="0" name="priorSubjectId" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>250</a:displayOrder>
+                                    <ra:nativeAttributeName>priorSubject-id</ra:nativeAttributeName>
+                                    <ra:frameworkAttributeName>priorSubjectId</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element ref="icfs:name">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayName>ConnId Name</a:displayName>
+                                    <a:displayOrder>110</a:displayOrder>
+                                    <ra:frameworkAttributeName>__NAME__</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" name="job" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>260</a:displayOrder>
+                                    <ra:frameworkAttributeName>job</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" name="fullname" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>270</a:displayOrder>
+                                    <ra:frameworkAttributeName>fullname</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" name="givenName" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>280</a:displayOrder>
+                                    <ra:frameworkAttributeName>givenName</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" name="familyName" type="xsd:string">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayOrder>290</a:displayOrder>
+                                    <ra:frameworkAttributeName>familyName</ra:frameworkAttributeName>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                        <xsd:element minOccurs="0" ref="icfs:uid">
+                            <xsd:annotation>
+                                <xsd:appinfo>
+                                    <a:displayName>ConnId UID</a:displayName>
+                                    <a:displayOrder>100</a:displayOrder>
+                                    <a:access>read</a:access>
+                                </xsd:appinfo>
+                            </xsd:annotation>
+                        </xsd:element>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:schema>
+        </definition>
+    </schema>
+    <schemaHandling>
+        <objectType id="5">
+            <kind>account</kind>
+            <intent>default</intent>
+            <default>true</default>
+            <objectClass>ri:MESSAGE_OBJECT_CLASS___ACCOUNT__</objectClass>
+            <attribute id="6">
+                <c:ref>icfs:name</c:ref>
+                <displayName>Employee ID</displayName>
+                <inbound id="14">
+                    <target>
+                        <c:path>$user/name</c:path>
+                    </target>
+                </inbound>
+            </attribute>
+            <attribute id="7">
+                <c:ref>ri:givenName</c:ref>
+                <inbound id="15">
+                    <target>
+                        <c:path>$user/givenName</c:path>
+                    </target>
+                </inbound>
+            </attribute>
+            <attribute id="8">
+                <c:ref>ri:fullname</c:ref>
+                <inbound id="16">
+                    <expression>
+                        <script xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:ScriptExpressionEvaluatorType">
+                            <code>focus?.getGivenName() + ' ' + focus?.getFamilyName()</code>
+                        </script>
+                    </expression>
+                    <target>
+                        <c:path>$user/fullName</c:path>
+                    </target>
+                </inbound>
+            </attribute>
+            <attribute id="9">
+                <c:ref>ri:familyName</c:ref>
+                <inbound id="17">
+                    <target>
+                        <c:path>$user/familyName</c:path>
+                    </target>
+                </inbound>
+            </attribute>
+            <attribute id="10">
+                <c:ref>ri:orgId</c:ref>
+                <inbound id="18">
+                    <target>
+                        <c:path>$user/organizationalUnit</c:path>
+                    </target>
+                </inbound>
+            </attribute>
+            <attribute id="11">
+                <c:ref>ri:job</c:ref>
+                <inbound id="19">
+                    <target>
+                        <c:path>$user/title</c:path>
+                    </target>
+                </inbound>
+            </attribute>
+            <attribute id="12">
+                <c:ref>ri:phone</c:ref>
+                <inbound id="20">
+                    <expression>
+                      <trace>true</trace>
+                        <script xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:ScriptExpressionEvaluatorType">
+                            <code>
+                              if (input) { input.substring(input.indexOf('.') + 1, input.length()) }
+                           </code>
+                        </script>
+                    </expression>
+                    <target>
+                        <c:path>$user/telephoneNumber</c:path>
+                    </target>
+                </inbound>
+            </attribute>
+            <attribute id="13">
+                <c:ref>ri:email</c:ref>
+                <inbound id="21">
+                    <expression>
+                        <script xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:ScriptExpressionEvaluatorType">
+                            <code>
+                              if(input) { input.substring(input.indexOf('.') + 1, input.length()) }
+                           </code>
+                        </script>
+                    </expression>
+                    <target>
+                        <c:path>$user/emailAddress</c:path>
+                    </target>
+                </inbound>
+            </attribute>
+            <activation>
+                <administrativeStatus>
+                    <inbound id="22">
+                        <strength>weak</strength>
+                    </inbound>
+                </administrativeStatus>
+            </activation>
+            <credentials>
+                <password xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:ResourcePasswordDefinitionType">
+                    <inbound>
+                        <strength>weak</strength>
+                        <expression>
+                            <generate xsi:type="c:GenerateExpressionEvaluatorType"/>
+                        </expression>
+                    </inbound>
+                </password>
+            </credentials>
+        </objectType>
+    </schemaHandling>
+    <capabilities>
+        <cachingMetadata>
+            <retrievalTimestamp>2019-05-10T19:14:33.136Z</retrievalTimestamp>
+            <serialNumber>b206157efe3db85b-2aa5ea9c80762fd5</serialNumber>
+        </cachingMetadata>
+        <native xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:CapabilityCollectionType">
+            <cap:schema/>
+            <cap:testConnection/>
+            <cap:delete/>
+            <cap:script>
+                <cap:host>
+                    <cap:type>connector</cap:type>
+                </cap:host>
+            </cap:script>
+            <cap:addRemoveAttributeValues/>
+            <cap:read>
+                <cap:returnDefaultAttributesOption>false</cap:returnDefaultAttributesOption>
+            </cap:read>
+        </native>
+        <configured xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:CapabilityCollectionType">
+            <cap:testConnection>
+                <cap:enabled>true</cap:enabled>
+            </cap:testConnection>
+            <cap:read>
+                <cap:enabled>true</cap:enabled>
+            </cap:read>
+            <cap:delete>
+                <cap:enabled>true</cap:enabled>
+            </cap:delete>
+            <cap:script>
+                <cap:enabled>true</cap:enabled>
+                <cap:host>
+                    <cap:type>connector</cap:type>
+                </cap:host>
+            </cap:script>
+            <cap:addRemoveAttributeValues>
+                <cap:enabled>true</cap:enabled>
+            </cap:addRemoveAttributeValues>
+        </configured>
+    </capabilities>
+    <projection>
+        <assignmentPolicyEnforcement>full</assignmentPolicyEnforcement>
+    </projection>
+    <synchronization>
         <objectSynchronization>
             <enabled>true</enabled>
             <correlation>
@@ -411,3 +505,4 @@
         </objectSynchronization>
     </synchronization>
 </resource>
+