TAB Refactoring for monitoring.pp