adding some plugin support