Updated AutoInfile and copy_datasets macros