Adapt to latest scpiml