Update to ToolKit v2.1