Added a few more helper functions