Added pharmacology support