Improved CLI options
Renamed dependency