Working on adding support for template file attachments