Updating calls to reorganized utility functions