add regexp support