Utility functions updated