Add batch-mode to setup