Update to ToolKit v2.3