Hi, devs. Here is tentative roadmap for new JCRStore + QueryPlugin: I'll write a proposals about everything important things to do. Millstone1, jcrstore renew: store system refactoring: make stores as components (but they still be in xwiki-core) introduce new query manager in store (low-level, support of HQL | XPath,JCRSQL depending of store) remove duplications in Hibernate & Jcr stores move jcrstore out of xwiki-core (~ xp-core/xwiki-jcr) support of recent Jackrabbit & eXoJCR write functional test suite for store system. final proposal of new QueryPlugin result: jcrstore runs in functional test suite for store system. deadline = June 20 = XE 1.5M2 (feature freeze for XE1.5) Millstone2, queryplugin renew: implement new QueryPlugin for both Hibernate&Jcr stores. rewrite hql queries in XE with QueryPlugin. implement remained things in JCRStore result: XE fully works on JCR. deadline = ~10 July So XE on JCR will fully works since 1.6M1 at least. WDYT? -- Artem Melentyev