Switching to bundle plugin