Ok, I think that it's important to include this in this PR, completely agree. Thanks! I will ping you again when ready.