Updated to match cli changes