Used the previous refactoring for the utilisations builder as well
Used the previous refactoring for the utilisations builder as well

ageorgou/pepapot,allanderek/pepapot,allanderek/pepapot,ageorgou/pepapot