Should be using public xwiki-tools