Moved swap to base class