Changes to be able to list agents in the monitor