added parser option, fixed attachments issues