Fix Issues with base classes for entities