Added variable substitution for props
Don't know if that will be useful however.