Added buffer list and argument list, buffer and substitution