adding support for child property substitution - #1