Some changes for load-balancing but unsuccessful.
Better edge-based enumeration support