I just moved it from Util. Can we do this work in next pull request?