Added a couple of additional convenience functions