Add ending year and update date generation