Better solution for attachments