Map jsonization added, array jsonization corrected