CLI Changes