Handle Ping/Push separately