Added attachments handler
updated attachment manager