Added year and country functionality