Updated to new configuration system