Add Annotation tools and manual patch extractor