Changing CLI to match manager changes