More work on plugins