Move FileAttachment specific code out of Attachment