regex support improved