Add TODO and comment to new attachments logic