Revert "Revert "Updates needed for new Configuration API""

This reverts commit a6455e2c6ffe3db21f0e9eb719c50b64925c6d5d.