Add regex for variable matching,