Improved configuration a little