Added some minor improvements for the confiuguration