Add more event listener system for connection