Reworking attachments to be under instance