Changes needed for deployment