Upgrade and heavily refactor monitoring services