Add support for annotation columns