Changed Configs so more friendly to overriding