Added framework for week numbers