Getting ready for the plugin architecture