ooops, what a shame :) xD anyway glad the approach has sense for you :) Do you mind to update pr so with changes? 

So I can perform last test and land it :) Thanks again for keep working on it!