flesh out plugin support some more