Update import statements for plugin scope