DataMapping performance improvement