Made config file more generic