Better subscription expiration management