Extended CLI with working options