Add extraction of current year