Updates to work with PHPCR