Added regex filtering and a match method