Add better maintenance handling