More work done on core plugin.