better support for extraction of annotations