Updated to CLI 2.0