Version 2.0 - Salesforce.com changes