Quick updates to add base classes to additional packages.