Added ping-pong to the API and client to enable keep alive