Adapt to new plugin site behavior