Added code for web-application