Better interaction of annotation database finder and modules