[BF] Unconverted P2P code that still related to Doctrine1