Update *-t-m and Annotator libraries