Use proper connection events