Started modifying security expiration handling.