Add some more of the helper functions