added regexp support