Switch to use jcr implementation