Makes sense. Should this be part of this or new pull request?