Adapt to new Store plugin