New: commandline arguments added