Updated XML files and JSON implementation