Add option to disable xm flow