Added PING/PONG support