Added a few more convenience functions