PIM-1617 : Add missing uses