Context and ConsoleClient classes updated.