Better commandline handling