Improve configuration