Hi Sergiu, I have created a JIRA issue at http://jira.xwiki.org/jira/browse/XWIKI-2763and attached a patch that would complete the migration. Please review it and apply it as you see fit. I can start the integration as soon as this is done. I kind of have to turn off my computer now because it's thundering outside (really scary). Hope to be online in couple of hours. Thanks. - Asiri