Add additional variable matching