Added base classes option