Updated AutoInfile macros