Updated core bundle framework