Adding regex support