Minor tracking change

Grouped all maintenance events