PIM-2127 : change methods to match interface expectations