Added multiyear support