Adding plugin support