Bootstrap custom, repository refactoring