Refactoring modele to breeze - the end