Added ability to serialize properties in substituted nodes