Improvement of output content model in project Cq5-example-helloworld