Made a small PR here would be great to get some feedback. https://github.com/datahub-project/datahub/pull/8229/files