Updated for ShipLib v2.0.5