We should introduce interfaces for the core bundle repositories, agree?