Added (future) plugin support