Updated DTM + Annotator