Added some more functionality to util