added services and changed base class name