Update code to use new Config struct