Add support for $@ variable