Add commandline argument handling