Added new monitor and fixed memory leak