More work on the custom plugin loading