Implemented Connection Awareness