Add sleep support - try to mitigate issues where snapshot is not being removed