Switch from plugin to feature