CLI support (in progress)