Added some additional helper functions