Refactored monitors -> rules