added regex support