Make the configuration more modular