Amélioration du mapping + Connect BDD (BUG)