Added base classes for all components