Better config setup flow