Thanks all for your feedback. I am going to post a review request for the 
changes.

Aurélien