Plugins - improve contrib logic