Add CLI support