Added auto factory support