Update with latests changes from IFCA