Added expiry dates for access and keys, fixed logic for continuing expiring products