Changes for attachments support