Added initial plugin support