Updated DTM + Annotator, follow API changes