Add delimiters in payload expand
Updated scenarios