Added regex pattern support