Adding support for extra vars