Extended AnnotatedThing data model