Refactored configuration.

[permalink]