Added support for 'doing' CLI