CLI support