Updated DTM and Annotator