Added complted CLI interface