Feature 3229: Working on monitoring - in progress