Updated Phenotype model and refractored code

Signed-off-by: Sheik Hassan <solergiga@yahoo.com>
Merge pull request #302 from hassanNS/issue-294

Updated Phenotype modal