Support adding comments to scans
Completed support for including messages