2 small changed to json output for better parsing.
Added some more container classes for better json output.