Few modifications on the application design