Added a couple more utility functions