change on the location and improvement on the target object
Patch common data class