JCR2 defines a new query API that is similar to, but not exactly the same as, the existing AQM and JCR query API. Although ModeShape already supports the query languages required by JCR2, some additional API compatibility work will need to be done. The search engine will also need to be modified slightly to support indexing the new primitive types available in JCR2 (e.g., weakreference).