Added expiry functionality