Thanks Marco, and sorry for "upsetting" you :/ I'd like to do some adjustments if needed for 4.7 or 4.6.X as I did these last weeks, but I totally agree with you, no big refactoring or changes should be needed. Thanks!