Use new utility functions.