@xaviershay I have these changes in my fork now. Should I open a new PR or do you want to update yours?