Ship & ShipHandler merged