Handle configuration a bit better