Plugin redesign