Add support for by-property override