Better support for plugin options
Plugins now specifying options "the new way"