Switch to click for command line handling