Adding support for Attachments

Phew! That took longer than expected