Add command line arguments and unattended mode