Updated AttachmentMapper to work with new validation in ES 2.0