Added regex support