Updated the different Util Classes