Add shutdown support