Optimize client