Added support for the Maintenance Module