Support LegacyPeer