Adapt to changes of @WithPlugin