PIM-3234 : extract method to ease override