Klondike - driver redesign + api message correction