Converted from interface to base class