Added --non-interactive mode