Coming closer to cover all cases with tomp2p security aspects...