added server and client side changes for application.