Little more logic to configuration handling