Added certain config flag to make demo/test easier