Add support for "arguments"