Add commandline handling