Core changes to plugin setup