Updated for auto answer file generation