[-] BO : Refacto for #PSCFI-7174