added comments and attachment file handling