Plugin host changes