vol2: Added most of the base classes needed from vol1