Update for CLI support