Organization model changes for Salesforce

These model changes are already in dev/onepercent