PIM-2319 : re-order methods