Include drug and drug_ingredient in mvp