Fixed PingClient
Added Prodiction support