Update helper functions