Understood after talking with @ferjm ! :) Could you open a new PR with all changes? Thanks!