Add decrypttion in transport and fix some symmetry