Add more regex rules