Improvement the example project