Added models for drugs and drug packages.