Enhance year handling