Got rid of all the maps. Now uses JsonSection instead.