Updated to CLI 2.1