Add regex support