Upgraded to soi-toolkit v2.0.0-M2