Command Line support in CLI