Bundle -> Plugin
Added auto closing plugins again