Refactoring - get rid of add_attachments() method (too trivial)