More work on dynamic loading for plugins