Added annotate and report functions