change json handler implementation