Added support for Attachments macro and performance improvements

Fixed in this release