Added year enablement check