With this, preprocessing is simplified to just refreshing expiry dates. No real change to auto-generation logic.