Added a few more helper methods