Add regexp support