AID - Adapted To Include Drugs