Enhance Performnace for Client and P2P