Added a few more util functions