Changes to support updated salesforce adapter api.