added more plugin support