Step 5 - Implementing Expiry