PLS-CADD Swap Attachments Improvements