Added a few more utility functions