Enhance Performance for Client and P2P