added name and mappedVars fields to annotation