Updated framework of the demo app.