queryAnnotatorPropertyHM and queryAnnotatorClassHM is updated and
functional.
I haven't been able to test the subclass behavior.