add DrugStruct and prop generator