Final changes for adding attachments