Added code to handle combining configuration object with defaults.