get certificate generation working with the new annotation types