Minor added json 1.8 support