Added regex matching