Last changes before switching to Salesforce implementation