Moved ExtendedSystemInfo from ExtendedShipInfo into ShipState