Moved maintenace methods to MaintenanceClass