Updates to use new utility function.