Continue converting code to use the new configuration and utility classes.