Attachment Storage Improvements