More work on the plugins