Use key/value params rather than method parameters

Some of the calls have a huge number of parameters eg pharma. This makes it easy to get the params wrong or in the wrong places. Could switch to key/value params in an object instead.
