Update to 1.0-8.0 integratin YEAR_WITHIN into package