Add more utility functions