improve config, keys changed