Snnippet Annotator Enhancements