Adding delegation state and heuristics.