added custom plugin support