Re-setup base classes