MAJOR CHANGE: SAP ID provided for all entities.