Generate extra variables for match