some changes for zero-downtime deployment