Added deep scan for comments