Fix(Attachments): Support for new stock