PIM-2340: Use interfaces