Add command line and logging