adding plugin support