Adapt to new CLaSH API