Adjusted PHPCR handling