Few more changes for deploying prototype