Structure changes and base class additions