Further Client optimizations