Simplify base classes