Starting to add annotation types.