JSON changes - fix up jsonToStream for user object - now you need to make jsonToStream a member function. Array and Map generation for containers now need to be explicitly named