Adapt to new shine API