Move more things to Util