Added drug type and drug name form DB