Added regex search support