Completed CLI implementation