Switch to Plugin from deprecated Bundle