[*] BO : Product Pack Refacto - fixes/updates