Replaced generic annotations with new ones