More work on core plugin.