Added support for better bundle inheritance