Add support for $vars