Add a few utilities