Use new Week abstraction.