Added some more utils