Updated Phenotype model and refractored code

Signed-off-by: Sheik Hassan <solergiga@yahoo.com>