Updates to match cli changes