add more plugin support