EFDataMappingKit rewrite