Added new classical phenotype fields and entity