Now use new utility functions from vih_commerce