JsonHandler improvements