add types and annotators