The new SDK has a lot of new/changed/removed options, we should map them all since #184 has just mapped a few new ones.

In regard to options that require an instance of something (like callables) we should remap those to use services.