Forgot to include this when I pushed last night, now using our own DiseaseDisorder type which inherits from Annotation. Cleanup of consumer.