Changes made for integration with Web App.