Added week number handling