Add support for will change

Only basic testing, but allows use of property.