refactored ConnectionMonitor and ConnectionMonitorAspect