Reshuffle the annotation functionality to generalize and to allow for transforms support.