Added some more functionality to utils