Revise annotator and consumer
Signed-off-by: machongshen <machongshen@gmail.com>