Add some more utils