Client.cs Optimizations