diff --git a/midpoint/assets/objects/01_sis.xml b/midpoint/assets/objects/01_sis.xml
deleted file mode 100644
index d305d98..0000000
--- a/midpoint/assets/objects/01_sis.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-
-
-
-
-
-
- SIS DB Source
-
-
-
-
- c:connectorType
- org.identityconnectors.databasetable.DatabaseTableConnector
-
-
-
-
-
-
- 3306
- midpoint-poc-mysql
- root
- root
- myapp_development
- users
- id
- password
- com.mysql.jdbc.Driver
- jdbc:mysql://%h:%p/%d?useUnicode=true&characterEncoding=utf8&connectionCollation=utf8_bin&useSSL=false
- false
- true
- false
- false
- updated_at
-
-
-
-
-
- account
- Normal Account
- true
- AccountObjectClass
-
-
- [icfs:uid]
- Entry UUID
-
-
- true
-
-
-
-
-
- [icfs:name]
- name
-
- 0
-
- true
- true
- true
-
-
-
-
-
- [ri:uid]
-
-
- $user/name
-
-
-
-
-
- [ri:givenname]
-
-
- $user/givenName
-
-
-
-
-
- [ri:surname]
-
-
- $user/familyName
-
-
-
-
-
- [ri:fullName]
-
-
- $user/fullName
-
-
-
-
-
- [ri:lfname]
-
-
- $user/nickName
-
-
-
-
-
- [ri:email]
-
-
- $user/emailAddress
-
-
-
-
-
-
-
-
-
- true
-
-
-
- Correlation expression is a search query.
- Following search queury will look for users that have "name"
- equal to the "uid" attribute of the account. Simply speaking,
- it will look for match in usernames in the IDM and the resource.
- The correlation rule always looks for users, so it will not match
- any other object type.
-
-
- name
-
- $c:account/c:attributes/ri:uid
-
-
-
-
-
- linked
- true
-
-
-
- deleted
- true
-
- http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlink
-
-
-
-
- unlinked
- true
-
- http://midpoint.evolveum.com/xml/ns/public/model/action-3#link
-
-
-
- unmatched
- true
-
- http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus
-
-
-
-
-
-
-
-
- Import SIS Accounts
-
- account
- ri:AccountObjectClass
-
-
-
- runnable
- ImportingAccounts
- http://midpoint.evolveum.com/xml/ns/public/model/synchronization/task/import/handler-3
-
- single
- loose
- restart
-
-
-
diff --git a/midpoint/assets/objects/01_sis_resources.xml b/midpoint/assets/objects/01_sis_resources.xml
new file mode 100644
index 0000000..9afe6d3
--- /dev/null
+++ b/midpoint/assets/objects/01_sis_resources.xml
@@ -0,0 +1,187 @@
+
+
+
+
+
+ SIS DB Source
+
+
+
+
+ c:connectorType
+ org.identityconnectors.databasetable.DatabaseTableConnector
+
+
+
+
+
+
+ 3306
+ midpoint-poc-mysql
+ root
+ root
+ myapp_development
+ users
+ id
+ password
+ com.mysql.jdbc.Driver
+ jdbc:mysql://%h:%p/%d?useUnicode=true&characterEncoding=utf8&connectionCollation=utf8_bin&useSSL=false
+ false
+ true
+ false
+ false
+ updated_at
+
+
+
+
+
+ account
+ Normal Account
+ true
+ AccountObjectClass
+
+
+ [icfs:uid]
+ Entry UUID
+
+
+ true
+
+
+
+
+
+ [icfs:name]
+ name
+
+ 0
+
+ true
+ true
+ true
+
+
+
+
+
+ [ri:uid]
+
+
+ $user/name
+
+
+
+
+
+ [ri:givenname]
+
+
+ $user/givenName
+
+
+
+
+
+ [ri:surname]
+
+
+ $user/familyName
+
+
+
+
+
+ [ri:fullName]
+
+
+ $user/fullName
+
+
+
+
+
+ [ri:lfname]
+
+
+ $user/nickName
+
+
+
+
+
+ [ri:email]
+
+
+ $user/emailAddress
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+ Correlation expression is a search query.
+ Following search queury will look for users that have "name"
+ equal to the "uid" attribute of the account. Simply speaking,
+ it will look for match in usernames in the IDM and the resource.
+ The correlation rule always looks for users, so it will not match
+ any other object type.
+
+
+ name
+
+ $c:account/c:attributes/ri:uid
+
+
+
+
+
+ linked
+ true
+
+
+
+ deleted
+ true
+
+ http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlink
+
+
+
+
+ unlinked
+ true
+
+ http://midpoint.evolveum.com/xml/ns/public/model/action-3#link
+
+
+
+ unmatched
+ true
+
+ http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus
+
+
+
+
+
+
+
diff --git a/midpoint/assets/objects/02_sis_tasks.xml b/midpoint/assets/objects/02_sis_tasks.xml
new file mode 100644
index 0000000..2ef325d
--- /dev/null
+++ b/midpoint/assets/objects/02_sis_tasks.xml
@@ -0,0 +1,27 @@
+
+
+
+
+ Import SIS Accounts
+
+ account
+ ri:AccountObjectClass
+
+
+
+ runnable
+ ImportingAccounts
+ http://midpoint.evolveum.com/xml/ns/public/model/synchronization/task/import/handler-3
+
+ single
+ loose
+ restart
+
+
diff --git a/midpoint/assets/objects/import_objects.sh b/midpoint/assets/objects/import_objects.sh
index e2bd67d..9e3e4bc 100755
--- a/midpoint/assets/objects/import_objects.sh
+++ b/midpoint/assets/objects/import_objects.sh
@@ -3,6 +3,7 @@
# import_objects.sh, DESCRIPTION
#
echo "Importing Midpoint objects"
-# TODO: Change this to loop through all files in directory in ascending order
-curl --user administrator:5ecr3t -H "Content-Type: application/xml" -X POST http://localhost:8080/midpoint/ws/rest/resources -d @/midpoint_objects/01_sis.xml -v
+# TODO: Change this to loop through all files in directory in ascending order (somehow knowing what object type)
+curl --user administrator:5ecr3t -H "Content-Type: application/xml" -X POST http://localhost:8080/midpoint/ws/rest/resources -d @/midpoint_objects/01_sis_resources.xml -v
+curl --user administrator:5ecr3t -H "Content-Type: application/xml" -X POST http://localhost:8080/midpoint/ws/rest/tasks -d @/midpoint_objects/02_sis_tasks.xml -v
echo "Done importing Midpoint objects"