Adapt to scotty API change