Refactor some stuff to take into account the last changes from version 5.12 of Silverpeas