initially added plugin support