Enhanced base class structure