Moved maintenance methods to MaintenaceClass