Switched to using new style configuration file