Updated for new configuration file