Additional Changes to the ConfigWrapper