Enhance HelloWorld example