Update Configuration
Revert "Update Configuration"

This reverts commit d49753c265a6a04bcff60e835dc6742d38bc825f.
Revert "Revert "Update Configuration""

This reverts commit 17e0ecfe174f16c1a33f7517fdad74c3e09ceeb5.