Even more work on the plugins