Private Key expiration impovements