Updating annotators to use new type system