Change JSON format slightly, add more places