Add support for := variable substitution