Better Annot Class hierarchy