SC: updates to data context, fix for auto data mapping and fixes to unit tests