Made some changes for deployment