Replace reference to abstract class by reference to interface