Updates to work with salesforce