Rewrite Utils, add NumberUtil