Added tool class for listener housekeeping