Refactor monitor category