Changed json to be an intermediary parsed format