Adding more commands and improving CLI interface