Making configuration a little more flexible.