Refactored name CommandLine -> Client
Refactored ...