Added some more convenience functions