JSON parsing added and merged