Add regex filtering, not complete