Updated P2P Domain Objects