Improve configuration step