Optimize Client