Updated base class structure