Improvements in the example project