Added some more helper functions