Added handling for maintenance downtime