Added auto file support