Refactored Client class to avoid half-baked multiple inheritance based chunking of the functionality.