Adding non interactive mode options