Updated to current cli syntax.