improved Json parsing part