Update for CLI changes