Adding bundles namespace support (other than Unifik)