Updated to new Json format