Updated the app flow to intergrate all the use cases