Add some new rules and year recognition