@mbrochh do you think you'll have a chance to make these changes or should we close this PR for now?