Added more functionality for CLI