Adding some more classes to the system monitor