Added more flags for automatic setup