Update to ToolKit v2.2