NX-493: Attachment handling and leaner parsing