Add replacement tools for the Data class
Add new PropertyExtender class