Improve configuration folders handlers