Make drugs a little more abstract in instance handling.