Update helpers.
Update code to alllow property interpolation.