Add Command-line interface
Optimization