#123: CLI support