Adapted for new bundle and components distribution