Added some more helper methods