Update to expiry dates checker