Added KeepAlive and PQuery