Please, @tamaskerenyi, sending for you to review some modifications. It is being tested by ESTIA/PSI team.