add prefix to the key name
change some format