Json processing changes