Added auto.direct and auto.master