Added base classes to structures and actions