Added bundle info as a first implementation and a first attempt to use the automatic registration through compiler pass.