Updating for latest version of Salesforce