Generalize OAI options

Also allow options to be passed to individual methods.