Updated templates for derived annotations.