Added new utility functions