Refactor monitoring