Enhancements in starter app