updated support for maintanance mode