Updated some of the helper calls