Basic CLI support