Use Object for property value
Rename property value renamer and add property key renamer