Improve configuration step, see #1