An overhaul of the Canada Infrastructure Bank (CIB), following the current legislative review, should include less focus on public-private partnerships, and more flexible project delivery models, according to critics and advocacy organizations.