More ConsoleClient work