Refactoring bootstrap and fixing multiple identification bug