Improvement of mapping in cq5-example-helloworld project