Improve configuration for next time